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

Downloads using get_request specifying only path now works.

Browse Source
This commit is contained in:
Joel Torstensson 2015-03-04 12:24:26 +01:00
parent 49c666a4a8
commit 4e7e97232e
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
qutebrowser/browser/downloads.py
View File

@ -658,16 +658,17 @@ class DownloadManager(QAbstractListModel):
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_filename = urlutils.filename_from_url(request.url()) suggested_fn = urlutils.filename_from_url(request.url())
encoding = sys.getfilesystemencoding() encoding = sys.getfilesystemencoding()
suggested_filename = utils.force_encoding(suggested_filename, encoding) suggested_fn = utils.force_encoding(suggested_fn, encoding)
q = self._prepare_question() q = self._prepare_question()
q.default = path_suggestion(suggested_filename) q.default = path_suggestion(suggested_fn)
message_bridge = objreg.get('message-bridge', scope='window', message_bridge = objreg.get('message-bridge', scope='window',
window=self._win_id) window=self._win_id)
q.answered.connect( q.answered.connect(
lambda fn: self.fetch_request(request, page, filename=fn, lambda fn: self.fetch_request(request, page, filename=fn,
auto_remove=auto_remove)) auto_remove=auto_remove,
suggested_filename=suggested_fn))
message_bridge.ask(q, blocking=False) message_bridge.ask(q, blocking=False)
return None return None
@ -711,6 +712,7 @@ class DownloadManager(QAbstractListModel):
""" """
if fileobj is not None and filename is not None: if fileobj is not None and filename is not None:
raise TypeError("Only one of fileobj/filename may be given!") raise TypeError("Only one of fileobj/filename may be given!")
if not suggested_filename:
if filename is not None: if filename is not None:
suggested_filename = os.path.basename(filename) suggested_filename = os.path.basename(filename)
elif fileobj is not None and getattr(fileobj, 'name', None): elif fileobj is not None and getattr(fileobj, 'name', None):