rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

browser.downloads: Download with default name if path is given.

Browse Source
This commit is contained in:
Florian Bruhin 2014-09-01 17:51:49 +02:00
parent 0a646b110b
commit 6d97da7bcc
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/TODO
View File

@ -48,7 +48,6 @@ New big features
Downloads
=========
- Download to default filename if only path is given
- Remember last path for prompt, if explicitely set.
- re-ask instead of killing download if path is invalid
- open files

27
qutebrowser/browser/downloads.py
View File

@ -198,22 +198,31 @@ class DownloadItem(QObject):
filename: The full filename to save the download to.
None: special value to stop the download.
"""
if os.path.isabs(filename):
target = os.path.expanduser(filename)
if self.filename is not None:
raise ValueError("Filename was already set! filename: {}, "
"existing: {}".format(filename, self.filename))
filename = os.path.expanduser(filename)
if os.path.isabs(filename) and os.path.isdir(filename):
# We got an absolute directory from the user, so we save it under
# the default filename in that directory.
self.filename = os.path.join(filename, self.basename)
elif os.path.isabs(filename):
# We got an absolute filename from the user, so we save it under
# that filename.
self.filename = filename
self.basename = os.path.basename(self.filename)
else:
# We only got a filename (without directory) from the user, so we
# save it under that filename in the default directory.
download_dir = config.get('storage', 'download-directory')
if download_dir is None:
download_dir = utils.get_standard_dir(
QStandardPaths.DownloadLocation)
target = os.path.join(download_dir, filename)
self.filename = os.path.join(download_dir, filename)
self.basename = filename
log.downloads.debug("Setting filename to {}".format(filename))
if self.filename is not None:
raise ValueError("Filename was already set! filename: {}, "
"existing: {}".format(filename, self.filename))
self.filename = target
self.basename = os.path.basename(target)
try:
self.fileobj = open(target, 'wb')
self.fileobj = open(self.filename, 'wb')
if self._do_delayed_write:
# Downloading to the buffer in RAM has already finished so we
# write out the data and clean up now.