diff options
| author | Jason Rosenzweig <mail4jasonr@gmail.com> | 2021-07-13 20:52:06 +0800 |
|---|---|---|
| committer | Jason Rosenzweig <mail4jasonr@gmail.com> | 2021-07-13 20:52:06 +0800 |
| commit | c7b48deea88b1dda69eb4e03f0214eea984100d8 (patch) | |
| tree | 941a02fdb1e0d00446873282fbfe0d16550dbbe2 /qutebrowser | |
| parent | 025e6110a9522b65bfb241bd1931d12ccd904db4 (diff) | |
| download | qutebrowser-c7b48deea88b1dda69eb4e03f0214eea984100d8.tar.gz qutebrowser-c7b48deea88b1dda69eb4e03f0214eea984100d8.zip | |
Made implementation simpler, removed unrelated change
Diffstat (limited to 'qutebrowser')
| -rw-r--r-- | qutebrowser/browser/downloads.py | 3 | ||||
| -rw-r--r-- | qutebrowser/browser/webengine/webenginedownloads.py | 18 |
2 files changed, 4 insertions, 17 deletions
diff --git a/qutebrowser/browser/downloads.py b/qutebrowser/browser/downloads.py index e09c8122b..fa4ac9da2 100644 --- a/qutebrowser/browser/downloads.py +++ b/qutebrowser/browser/downloads.py @@ -184,9 +184,6 @@ def get_filename_question(*, suggested_filename, url, parent=None): """ suggested_filename = utils.sanitize_filename(suggested_filename) - if url.toDisplayString()[:7] == "file://": - return "FILE" - q = usertypes.Question(parent) q.title = "Save file to:" q.text = "Please enter a location for <b>{}</b>".format( diff --git a/qutebrowser/browser/webengine/webenginedownloads.py b/qutebrowser/browser/webengine/webenginedownloads.py index e979c2749..af2224b2f 100644 --- a/qutebrowser/browser/webengine/webenginedownloads.py +++ b/qutebrowser/browser/webengine/webenginedownloads.py @@ -22,8 +22,6 @@ import re import os.path import functools -import platform -import subprocess from PyQt5.QtCore import pyqtSlot, Qt, QUrl, QObject from PyQt5.QtWebEngineWidgets import QWebEngineDownloadItem @@ -36,7 +34,7 @@ from qutebrowser.utils import (debug, usertypes, message, log, objreg, urlutils, class DownloadItem(downloads.AbstractDownloadItem): """A wrapper over a QWebEngineDownloadItem. - + Attributes: _qt_item: The wrapped item. """ @@ -295,17 +293,9 @@ class DownloadManager(downloads.AbstractDownloadManager): return # Ask the user for a filename - needs to be blocking! - question = downloads.get_filename_question( - suggested_filename=suggested_filename, url=qt_item.url(), - parent=self) - if question == "FILE": - if platform.system() == "Linux": - subprocess.call(["xdg-open", qt_item.url().toDisplayString()]) - elif platform.system() == 'Darwin': - subprocess.call(["open", qt_item.url().toDisplayString()]) - elif platform.system() == 'Windows': - subprocess.call(["start", qt_item.url().toDisplayString()]) - qt_item.cancel() + if url.toDisplayString()[:7] == "file://": + utils.open_file(url.toDisplayString()[7:]) + qt_item.cancel() else: self._init_filename_question(question, download) message.global_bridge.ask(question, blocking=True) |