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

Made static functions private.

Browse Source
This commit is contained in:
Joel Torstensson 2015-03-04 23:05:23 +01:00
parent 4e7e97232e
commit 7d48845afa
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
qutebrowser/browser/downloads.py
View File

@ -48,7 +48,7 @@ ModelRole = usertypes.enum('ModelRole', ['item'], start=Qt.UserRole,
RetryInfo = collections.namedtuple('RetryInfo', ['request', 'manager']) RetryInfo = collections.namedtuple('RetryInfo', ['request', 'manager'])
def download_dir(): def _download_dir():
"""Get the download directory to use.""" """Get the download directory to use."""
directory = config.get('storage', 'download-directory') directory = config.get('storage', 'download-directory')
if directory is None: if directory is None:
@ -56,15 +56,19 @@ def download_dir():
return directory return directory
def path_suggestion(filename): def _path_suggestion(filename):
"""Get the suggested file path""" """Get the suggested file path
Args:
filename: The filename to use if included in the suggestion.
"""
suggestion = config.get('completion', 'download-path-suggestion') suggestion = config.get('completion', 'download-path-suggestion')
if suggestion == 'path': if suggestion == 'path':
return download_dir() + os.sep return _download_dir() + os.sep
elif suggestion == 'filename': elif suggestion == 'filename':
return filename return filename
elif suggestion == 'both': elif suggestion == 'both':
return os.path.join(download_dir(), filename) return os.path.join(_download_dir(), filename)
else: else:
raise ValueError("Invalid suggestion value {}!".format(suggestion)) raise ValueError("Invalid suggestion value {}!".format(suggestion))
@ -392,6 +396,7 @@ class DownloadItem(QObject):
except OSError: except OSError:
log.downloads.exception("Failed to remove partial file") log.downloads.exception("Failed to remove partial file")
@pyqtSlot()
def retry(self): def retry(self):
"""Retry a failed download.""" """Retry a failed download."""
self.cancel() self.cancel()
@ -433,7 +438,7 @@ class DownloadItem(QObject):
else: else:
# We only got a filename (without directory) from the user, so we # We only got a filename (without directory) from the user, so we
# save it under that filename in the default directory. # save it under that filename in the default directory.
self._filename = os.path.join(download_dir(), filename) self._filename = os.path.join(_download_dir(), filename)
self.basename = 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):
@ -619,7 +624,8 @@ class DownloadManager(QAbstractListModel):
ui -> remove-finished-downloads is set to false. ui -> remove-finished-downloads is set to false.
Return: Return:
If the url is valid, the created DownloadItem. If the download could start immediately, (fileobj/filename given),
the created DownloadItem.
If not, None. If not, None.
""" """
@ -662,7 +668,7 @@ class DownloadManager(QAbstractListModel):
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()
q.default = path_suggestion(suggested_fn) 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(
@ -745,7 +751,7 @@ class DownloadManager(QAbstractListModel):
download.autoclose = False download.autoclose = False
else: else:
q = self._prepare_question() q = self._prepare_question()
q.default = path_suggestion(suggested_filename) q.default = _path_suggestion(suggested_filename)
q.answered.connect(download.set_filename) q.answered.connect(download.set_filename)
q.cancelled.connect(download.cancel) q.cancelled.connect(download.cancel)
download.cancelled.connect(q.abort) download.cancelled.connect(q.abort)