Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-09-27 11:31:03 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into censorship

Browse source
This commit is contained in:
Micah Lee 2022-03-06 13:55:36 -08:00
commit 7c1854193a
8 changed files with 73 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

18
cli/onionshare_cli/web/send_base_mode.py
View file

@ -44,8 +44,9 @@ class SendBaseModeWeb:
self.download_filesize = None
self.zip_writer = None
# Store the tempfile objects here, so when they're garbage collected the files are deleted
self.gzip_files = []
# Create a temporary dir to store gzip files in
self.gzip_tmp_dir = tempfile.TemporaryDirectory(dir=self.common.build_tmp_dir())
self.gzip_counter = 0
# If autostop_sharing, only allow one download at a time
self.download_in_progress = False
@ -193,15 +194,12 @@ class SendBaseModeWeb:
# gzip compress the individual file, if it hasn't already been compressed
if use_gzip:
if filesystem_path not in self.gzip_individual_files:
self.gzip_files.append(
tempfile.NamedTemporaryFile("wb+", dir=self.common.build_tmp_dir())
gzip_filename = os.path.join(
self.gzip_tmp_dir.name, str(self.gzip_counter)
)
gzip_file = self.gzip_files[-1]
self._gzip_compress(filesystem_path, gzip_file.name, 6, None)
self.gzip_individual_files[filesystem_path] = gzip_file.name
# Cleanup this temp file
self.web.cleanup_tempfiles.append(gzip_file)
self.gzip_counter += 1
self._gzip_compress(filesystem_path, gzip_filename, 6, None)
self.gzip_individual_files[filesystem_path] = gzip_filename
file_to_download = self.gzip_individual_files[filesystem_path]
filesize = os.path.getsize(self.gzip_individual_files[filesystem_path])

6
cli/onionshare_cli/web/web.py
View file

@ -171,7 +171,6 @@ class Web:
self.socketio.init_app(self.app)
self.chat_mode = ChatModeWeb(self.common, self)
self.cleanup_tempfiles = []
self.cleanup_tempdirs = []
def get_mode(self):
@ -405,13 +404,8 @@ class Web:
"""
self.common.log("Web", "cleanup")
# Close all of the tempfile.NamedTemporaryFile
for file in self.cleanup_tempfiles:
file.close()
# Clean up the tempfile.NamedTemporaryDirectory objects
for dir in self.cleanup_tempdirs:
dir.cleanup()
self.cleanup_tempfiles = []
self.cleanup_tempdirs = []