diff options
| author | Micah Lee <micah@micahflee.com> | 2021-05-05 02:35:14 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-05 02:35:14 +0000 |
| commit | 058544d1e62426a0d0310cf55c0282d4fd31f4a7 (patch) | |
| tree | b6086ead36425f4ad6928027213b6ce4c2c11dcb /desktop | |
| parent | 659ed83853a6e68d9509a7e5f59a38713f02c1e0 (diff) | |
| parent | 49a1e2890be9a86ac8b041d9dfef927e674a6ee2 (diff) | |
| download | onionshare-058544d1e62426a0d0310cf55c0282d4fd31f4a7.tar.gz onionshare-058544d1e62426a0d0310cf55c0282d4fd31f4a7.zip | |
Merge pull request #1344 from mig5/cleanup_web_files
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 | 3 | ||||
| -rw-r--r-- | desktop/src/onionshare/tab/tab.py | 4 |
3 files changed, 3 insertions, 6 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..839d30ea 100644 --- a/desktop/src/onionshare/tab/mode/share_mode/threads.py +++ b/desktop/src/onionshare/tab/mode/share_mode/threads.py @@ -47,9 +47,6 @@ 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.share_mode.cleanup_filenames - ) except OSError as e: self.error.emit(e.strerror) diff --git a/desktop/src/onionshare/tab/tab.py b/desktop/src/onionshare/tab/tab.py index 3d88ded5..d39cf826 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() + self.get_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() |