From 8a5b48d374ad5ba4f826b1c5dde27322cec304a5 Mon Sep 17 00:00:00 2001 From: Iordanis Grigoriou Date: Mon, 26 Jun 2017 23:21:32 +0200 Subject: [PATCH] Add suggested_fn argument to get_request --- qutebrowser/browser/commands.py | 10 +++++++--- qutebrowser/browser/qtnetworkdownloads.py | 9 +++++---- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py index f3d2473d6..fbf3fe914 100644 --- a/qutebrowser/browser/commands.py +++ b/qutebrowser/browser/commands.py @@ -1443,9 +1443,13 @@ class CommandDispatcher: download_manager.get_mhtml(tab, target) else: qnam = tab.networkaccessmanager() - download_manager.get(self._current_url(), user_agent=user_agent, - qnam=qnam, target=target, - title=self._current_title()) + download_manager.get( + self._current_url(), + user_agent=user_agent, + qnam=qnam, + target=target, + suggested_fn=utils.sanitize_filename(tab.title() + ".html") + ) @cmdutils.register(instance='command-dispatcher', scope='window') def view_source(self): diff --git a/qutebrowser/browser/qtnetworkdownloads.py b/qutebrowser/browser/qtnetworkdownloads.py index 6dd7c27c9..1e494b1d2 100644 --- a/qutebrowser/browser/qtnetworkdownloads.py +++ b/qutebrowser/browser/qtnetworkdownloads.py @@ -412,7 +412,7 @@ class DownloadManager(downloads.AbstractDownloadManager): mhtml.start_download_checked, tab=tab)) message.global_bridge.ask(question, blocking=False) - def get_request(self, request, *, target=None, title=None, **kwargs): + def get_request(self, request, *, target=None, suggested_fn=None, **kwargs): """Start a download with a QNetworkRequest. Args: @@ -428,9 +428,10 @@ class DownloadManager(downloads.AbstractDownloadManager): request.setAttribute(QNetworkRequest.CacheLoadControlAttribute, QNetworkRequest.AlwaysNetwork) - if request.url().scheme().lower() != 'data': - suggested_fn = (utils.sanitize_filename(title) + ".html" if title - else urlutils.filename_from_url(request.url())) + if suggested_fn is not None: + pass + elif request.url().scheme().lower() != 'data': + suggested_fn = urlutils.filename_from_url(request.url()) else: # We might be downloading a binary blob embedded on a page or even # generated dynamically via javascript. We try to figure out a more