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

Can now handle relative paths.

Browse Source
This commit is contained in:
Joel Torstensson 2015-03-05 23:44:12 +01:00
parent d449a60078
commit 0fb74da4ff
1 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
qutebrowser/browser/downloads.py
View File

@ -428,20 +428,12 @@ class DownloadItem(QObject):
# See https://github.com/The-Compiler/qutebrowser/issues/427 # See https://github.com/The-Compiler/qutebrowser/issues/427
encoding = sys.getfilesystemencoding() encoding = sys.getfilesystemencoding()
filename = utils.force_encoding(filename, encoding) filename = utils.force_encoding(filename, encoding)
if os.path.isabs(filename) and os.path.isdir(filename): if not self._create_full_filename(filename):
# We got an absolute directory from the user, so we save it under # We only got a filename (without directory) or a relative path
# the default filename in that directory. # from the user, so we append that to the default directory and
self._filename = os.path.join(filename, self.basename) # try again.
elif os.path.isabs(filename): self._create_full_filename(os.path.join(_download_dir(), 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.
self._filename = os.path.join(_download_dir(), filename)
self.basename = filename
log.downloads.debug("Setting filename to {}".format(filename)) log.downloads.debug("Setting filename to {}".format(filename))
if os.path.isfile(self._filename): if os.path.isfile(self._filename):
# The file already exists, so ask the user if it should be # The file already exists, so ask the user if it should be
@ -450,6 +442,25 @@ class DownloadItem(QObject):
else: else:
self._create_fileobj() self._create_fileobj()
def _create_full_filename(self, filename):
"""Tries to create the full filename.
Return:
True if the full filename was created, False otherwise.
"""
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)
return True
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)
return True
return False
def set_fileobj(self, fileobj): def set_fileobj(self, fileobj):
""""Set the file object to write the download to. """"Set the file object to write the download to.
@ -663,10 +674,10 @@ class DownloadManager(QAbstractListModel):
# https://bugreports.qt-project.org/browse/QTBUG-42757 # https://bugreports.qt-project.org/browse/QTBUG-42757
request.setAttribute(QNetworkRequest.CacheLoadControlAttribute, request.setAttribute(QNetworkRequest.CacheLoadControlAttribute,
QNetworkRequest.AlwaysNetwork) QNetworkRequest.AlwaysNetwork)
suggested_fn = urlutils.filename_from_url(request.url())
if fileobj is not None or filename is not None: if fileobj is not None or filename is not None:
return self.fetch_request(request, page, fileobj, filename, return self.fetch_request(request, page, fileobj, filename,
auto_remove) auto_remove, suggested_fn)
suggested_fn = urlutils.filename_from_url(request.url())
encoding = sys.getfilesystemencoding() encoding = sys.getfilesystemencoding()
suggested_fn = utils.force_encoding(suggested_fn, encoding) suggested_fn = utils.force_encoding(suggested_fn, encoding)
q = self._prepare_question() q = self._prepare_question()