diff options
| author | Micah Lee <micah@micahflee.com> | 2019-02-17 10:07:34 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-17 10:07:34 -0800 |
| commit | 41f5800e0eba7266dd1843ded9761afea902b615 (patch) | |
| tree | bf7b2c7751e237217d0b9209ae79550f46415263 | |
| parent | 8921bfeb56ca23237273fd170f5701916c1dda5f (diff) | |
| parent | 51e98f40e717a4413427ef3aab4da9839c7c6bea (diff) | |
| download | onionshare-41f5800e0eba7266dd1843ded9761afea902b615.tar.gz onionshare-41f5800e0eba7266dd1843ded9761afea902b615.zip | |
Merge pull request #906 from mig5/show_canceled_item_as_canceled
Update the GUI when the browser has canceled an upload in Receive Mode. Don't increment the completed counter
| -rw-r--r-- | onionshare/web/receive_mode.py | 8 | ||||
| -rw-r--r-- | onionshare_gui/mode/receive_mode/__init__.py | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/onionshare/web/receive_mode.py b/onionshare/web/receive_mode.py index 566946f2..a0cf5934 100644 --- a/onionshare/web/receive_mode.py +++ b/onionshare/web/receive_mode.py @@ -332,14 +332,14 @@ class ReceiveModeRequest(Request): self.told_gui_about_request = True - filename = secure_filename(filename) + self.filename = secure_filename(filename) - self.progress[filename] = { + self.progress[self.filename] = { 'uploaded_bytes': 0, 'complete': False } - f = ReceiveModeFile(self, filename, self.file_write_func, self.file_close_func) + f = ReceiveModeFile(self, self.filename, self.file_write_func, self.file_close_func) if f.upload_error: self.web.common.log('ReceiveModeRequest', '_get_file_stream', 'Error creating file') self.upload_error = True @@ -362,7 +362,7 @@ class ReceiveModeRequest(Request): if self.told_gui_about_request: upload_id = self.upload_id - if not self.web.stop_q.empty(): + if not self.web.stop_q.empty() or not self.progress[self.filename]['complete']: # Inform the GUI that the upload has canceled self.web.add_request(self.web.REQUEST_UPLOAD_CANCELED, self.path, { 'id': upload_id diff --git a/onionshare_gui/mode/receive_mode/__init__.py b/onionshare_gui/mode/receive_mode/__init__.py index 3a90f2f4..5fb33ab3 100644 --- a/onionshare_gui/mode/receive_mode/__init__.py +++ b/onionshare_gui/mode/receive_mode/__init__.py @@ -198,9 +198,7 @@ class ReceiveMode(Mode): self.history.update(event["data"]["id"], { 'action': 'canceled' }) - self.history.completed_count += 1 self.history.in_progress_count -= 1 - self.history.update_completed() self.history.update_in_progress() def on_reload_settings(self): |