diff options
| author | Micah Lee <micah@micahflee.com> | 2019-09-01 18:44:44 -0400 |
|---|---|---|
| committer | Micah Lee <micah@micahflee.com> | 2019-09-01 18:44:44 -0400 |
| commit | 973db941ecce380f5a74193baa5c33d6af999644 (patch) | |
| tree | 0c0c81436188605b4f3c2a71f40edeb9ac1758b9 /onionshare_gui | |
| parent | 7b2b8c22846141d9c38b22bdeac3b326817609f1 (diff) | |
| download | onionshare-973db941ecce380f5a74193baa5c33d6af999644.tar.gz onionshare-973db941ecce380f5a74193baa5c33d6af999644.zip | |
Move all mode-specific code out of SendBaseModeWeb and into inherited methods in WebsiteModeWeb and ShareModeWeb
Diffstat (limited to 'onionshare_gui')
| -rw-r--r-- | onionshare_gui/mode/share_mode/threads.py | 8 | ||||
| -rw-r--r-- | onionshare_gui/mode/website_mode/__init__.py | 8 |
2 files changed, 4 insertions, 12 deletions
diff --git a/onionshare_gui/mode/share_mode/threads.py b/onionshare_gui/mode/share_mode/threads.py index 24e2c242..fed362eb 100644 --- a/onionshare_gui/mode/share_mode/threads.py +++ b/onionshare_gui/mode/share_mode/threads.py @@ -41,12 +41,8 @@ class CompressThread(QtCore.QThread): self.mode.common.log('CompressThread', 'run') try: - if self.mode.web.share_mode.set_file_info(self.mode.filenames, processed_size_callback=self.set_processed_size): - self.success.emit() - else: - # Cancelled - pass - + self.mode.web.share_mode.set_file_info(self.mode.filenames, processed_size_callback=self.set_processed_size) + self.success.emit() self.mode.app.cleanup_filenames += self.mode.web.share_mode.cleanup_filenames except OSError as e: self.error.emit(e.strerror) diff --git a/onionshare_gui/mode/website_mode/__init__.py b/onionshare_gui/mode/website_mode/__init__.py index 50af4725..9f01cabc 100644 --- a/onionshare_gui/mode/website_mode/__init__.py +++ b/onionshare_gui/mode/website_mode/__init__.py @@ -165,12 +165,8 @@ class WebsiteMode(Mode): Step 3 in starting the server. Display large filesize warning, if applicable. """ - - if self.web.website_mode.set_file_info(self.filenames): - self.success.emit() - else: - # Cancelled - pass + self.web.website_mode.set_file_info(self.filenames) + self.success.emit() def start_server_error_custom(self): """ |