Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-05-02 06:26:10 -04:00
Code Issues Projects Releases Packages Wiki Activity

Explicitly cleanup temp files and dirs

Browse source
This commit is contained in:
Micah Lee 2021-12-01 20:34:54 -08:00
parent 926359de3c
commit 2ff5f53c69
6 changed files with 38 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

11
cli/onionshare_cli/web/share_mode.py
View file

@ -504,10 +504,13 @@ class ShareModeWeb(SendBaseModeWeb):
self.is_zipped = False
# Cleanup this tempfile
self.web.cleanup_tempfiles.append(self.gzip_file)
else:
# Zip up the files and folders
self.zip_writer = ZipWriter(
self.common, processed_size_callback=processed_size_callback
self.common, self.web, processed_size_callback=processed_size_callback
)
self.download_filename = self.zip_writer.zip_filename
for info in self.file_info["files"]:
@ -538,8 +541,9 @@ class ZipWriter(object):
filename.
"""
def __init__(self, common, zip_filename=None, processed_size_callback=None):
def __init__(self, common, web, zip_filename=None, processed_size_callback=None):
self.common = common
self.web = web
self.cancel_compression = False
if zip_filename:
@ -550,6 +554,9 @@ class ZipWriter(object):
)
self.zip_filename = f"{self.zip_temp_dir.name}/onionshare_{self.common.random_string(4, 6)}.zip"
# Cleanup this temp dir
self.web.cleanup_tempdirs.append(self.zip_temp_dir)
self.z = zipfile.ZipFile(self.zip_filename, "w", allowZip64=True)
self.processed_size_callback = processed_size_callback
if self.processed_size_callback is None: