diff options
| author | Miguel Jacq <mig@mig5.net> | 2021-05-04 16:21:42 +1000 |
|---|---|---|
| committer | Miguel Jacq <mig@mig5.net> | 2021-05-04 16:21:42 +1000 |
| commit | 04019389dad4fc1b7311fbfe77b412e0c576c143 (patch) | |
| tree | c17cc6d254583b784a2a6aa9353572365a24e139 /desktop | |
| parent | 659ed83853a6e68d9509a7e5f59a38713f02c1e0 (diff) | |
| download | onionshare-04019389dad4fc1b7311fbfe77b412e0c576c143.tar.gz onionshare-04019389dad4fc1b7311fbfe77b412e0c576c143.zip | |
Move the cleanup() function from Onionshare class to Web class, so that the list of files to be cleaned up is always available (needed for website temp files)
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/src/onionshare/tab/mode/__init__.py | 2 | ||||
| -rw-r--r-- | desktop/src/onionshare/tab/mode/share_mode/threads.py | 2 | ||||
| -rw-r--r-- | desktop/src/onionshare/tab/tab.py | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/desktop/src/onionshare/tab/mode/__init__.py b/desktop/src/onionshare/tab/mode/__init__.py index 567dc123..16944af8 100644 --- a/desktop/src/onionshare/tab/mode/__init__.py +++ b/desktop/src/onionshare/tab/mode/__init__.py @@ -382,7 +382,7 @@ class Mode(QtWidgets.QWidget): except Exception: # Probably we had no port to begin with (Onion service didn't start) pass - self.app.cleanup() + self.web.cleanup() self.stop_server_custom() diff --git a/desktop/src/onionshare/tab/mode/share_mode/threads.py b/desktop/src/onionshare/tab/mode/share_mode/threads.py index 74d5099a..5be94e88 100644 --- a/desktop/src/onionshare/tab/mode/share_mode/threads.py +++ b/desktop/src/onionshare/tab/mode/share_mode/threads.py @@ -47,7 +47,7 @@ class CompressThread(QtCore.QThread): self.mode.filenames, processed_size_callback=self.set_processed_size ) self.success.emit() - self.mode.app.cleanup_filenames += ( + self.mode.web.cleanup_filenames += ( self.mode.web.share_mode.cleanup_filenames ) except OSError as e: diff --git a/desktop/src/onionshare/tab/tab.py b/desktop/src/onionshare/tab/tab.py index 3d88ded5..5d929d01 100644 --- a/desktop/src/onionshare/tab/tab.py +++ b/desktop/src/onionshare/tab/tab.py @@ -668,7 +668,7 @@ class Tab(QtWidgets.QWidget): if self.close_dialog.clickedButton() == self.close_dialog.accept_button: self.common.log("Tab", "close_tab", "close, closing tab") self.get_mode().stop_server() - self.app.cleanup() + mode.web.cleanup() return True # Cancel else: @@ -681,4 +681,4 @@ class Tab(QtWidgets.QWidget): self.get_mode().web.stop(self.get_mode().app.port) self.get_mode().web_thread.quit() self.get_mode().web_thread.wait() - self.app.cleanup() + self.get_mode().web.cleanup() |