Don't default all directories to DownloadPath if empty
This commit is contained in:
parent
f40099e220
commit
11f1c8f369
@ -24,7 +24,7 @@ import os.path
|
||||
from functools import partial
|
||||
from collections import deque
|
||||
|
||||
from PyQt5.QtCore import pyqtSlot, pyqtSignal, QObject, QTimer
|
||||
from PyQt5.QtCore import pyqtSlot, pyqtSignal, QObject, QTimer, QStandardPaths
|
||||
from PyQt5.QtNetwork import QNetworkRequest, QNetworkReply
|
||||
|
||||
import qutebrowser.config.config as config
|
||||
@ -211,6 +211,9 @@ class DownloadItem(QObject):
|
||||
target = os.path.expanduser(filename)
|
||||
else:
|
||||
download_dir = config.get('storage', 'download-directory')
|
||||
if download_dir is None:
|
||||
download_dir = get_standard_dir(
|
||||
QStandardPaths.DownloadLocation)
|
||||
target = os.path.join(download_dir, filename)
|
||||
logger.debug("Setting filename to {}".format(filename))
|
||||
if self.filename is not None:
|
||||
|
@ -24,7 +24,7 @@ import shlex
|
||||
import os.path
|
||||
from sre_constants import error as RegexError
|
||||
|
||||
from PyQt5.QtCore import QUrl, QStandardPaths
|
||||
from PyQt5.QtCore import QUrl
|
||||
from PyQt5.QtGui import QColor, QFont
|
||||
from PyQt5.QtNetwork import QNetworkProxy
|
||||
|
||||
@ -800,7 +800,7 @@ class Directory(BaseType):
|
||||
|
||||
def transform(self, value):
|
||||
if not value:
|
||||
return get_standard_dir(QStandardPaths.DownloadLocation)
|
||||
return None
|
||||
return os.path.expanduser(value)
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user