diff options
author | Joel Torstensson <oed3933@gmail.com> | 2014-12-26 21:58:45 +0100 |
---|---|---|
committer | Joel Torstensson <oed3933@gmail.com> | 2014-12-26 21:58:45 +0100 |
commit | f0779f8cc043d68874660e5b3f7e03a077a01a3a (patch) | |
tree | 44574787ce7e0f0772c2fcaabf4101b13393b190 | |
parent | d1e0de236d4fbde7470224f8a133eac3f4f1861d (diff) | |
download | qutebrowser-f0779f8cc043d68874660e5b3f7e03a077a01a3a.tar.gz qutebrowser-f0779f8cc043d68874660e5b3f7e03a077a01a3a.zip |
User now asked if it wants to overwrite existing file.
Fix #318
-rw-r--r-- | qutebrowser/browser/downloads.py | 46 |
1 files changed, 38 insertions, 8 deletions
diff --git a/qutebrowser/browser/downloads.py b/qutebrowser/browser/downloads.py index 66154f6d7..40c1fa744 100644 --- a/qutebrowser/browser/downloads.py +++ b/qutebrowser/browser/downloads.py @@ -171,6 +171,7 @@ class DownloadItem(QObject): _read_timer: A QTimer which reads the QNetworkReply into self._buffer periodically. _retry_info: A RetryInfo instance. + _win_id: The window ID the DownloadItem runs in. Signals: data_changed: The downloads metadata changed. @@ -217,6 +218,7 @@ class DownloadItem(QObject): self.fileobj = None self._filename = None self.init_reply(reply) + self._win_id = parent._win_id def __repr__(self): return utils.get_repr(self, basename=self.basename) @@ -256,6 +258,25 @@ class DownloadItem(QObject): name=self.basename, speed=speed, remaining=remaining, perc=perc, down=down, total=total, errmsg=errmsg)) + def _create_fileobj(self): + """Creates a file object using the internal filename.""" + try: + fileobj = open(self._filename, 'wb') + except OSError as e: + self._die(e.strerror) + else: + self.set_fileobj(fileobj) + + def _create_overwrite_question(self): + """Create a Question object to be asked.""" + q = usertypes.Question(self) + q.text = " already exists. Overwrite? (y/n)" + q.mode = usertypes.PromptMode.yesno + q.answered_yes.connect(self._create_fileobj) + q.answered_no.connect(functools.partial(self.cancel, False)) + q.cancelled.connect(functools.partial(self.cancel, False)) + return q + def _die(self, msg): """Abort the download and emit an error.""" assert not self.successful @@ -312,8 +333,12 @@ class DownloadItem(QObject): return utils.interpolate_color( start, stop, self.stats.percentage(), system) - def cancel(self): - """Cancel the download.""" + def cancel(self, remove_data=True): + """Cancel the download. + + Args: + remove_data: Whether to remove the downloaded data. + """ log.downloads.debug("cancelled") self._read_timer.stop() self.cancelled.emit() @@ -325,7 +350,8 @@ class DownloadItem(QObject): if self.fileobj is not None: self.fileobj.close() try: - if self._filename is not None and os.path.exists(self._filename): + if (self._filename is not None and os.path.exists(self._filename) + and remove_data): os.remove(self._filename) except OSError: log.downloads.exception("Failed to remove partial file") @@ -376,12 +402,16 @@ class DownloadItem(QObject): self._filename = os.path.join(download_dir, filename) self.basename = filename log.downloads.debug("Setting filename to {}".format(filename)) - try: - fileobj = open(self._filename, 'wb') - except OSError as e: - self._die(e.strerror) + if os.path.isfile(self._filename): + # The file already exists, so ask the user if it should be + # overwritten. + q = self._create_overwrite_question() + q.text = self._filename + q.text + message_bridge = objreg.get('message-bridge', scope='window', + window=self._win_id) + message_bridge.ask(q, blocking=False) else: - self.set_fileobj(fileobj) + self._create_fileobj() def set_fileobj(self, fileobj): """"Set the file object to write the download to. |