Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2024-12-25 15:29:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix permission denied error in Windows, which was introduced using tempfile.NamedTemporaryFile, by using a TemporaryDirectory instead

Browse Source
This commit is contained in:
Micah Lee 2021-12-21 14:28:23 -08:00
parent f0d40beb77
commit 7e55e8e816
No known key found for this signature in database
GPG Key ID: 403C2657CD994F73
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cli/onionshare_cli/web/share_mode.py
View File

@ -189,7 +189,7 @@ class ShareModeWeb(SendBaseModeWeb):
# and serve that # and serve that
use_gzip = self.should_use_gzip() use_gzip = self.should_use_gzip()
if use_gzip: if use_gzip:
file_to_download = self.gzip_file.name file_to_download = self.gzip_filename
self.filesize = self.gzip_filesize self.filesize = self.gzip_filesize
etag = self.gzip_etag etag = self.gzip_etag
else: else:
@ -492,20 +492,21 @@ class ShareModeWeb(SendBaseModeWeb):
self.download_etag = make_etag(f) self.download_etag = make_etag(f)
# Compress the file with gzip now, so we don't have to do it on each request # Compress the file with gzip now, so we don't have to do it on each request
self.gzip_file = tempfile.NamedTemporaryFile( self.gzip_tmp_dir = tempfile.TemporaryDirectory(
"wb+", dir=self.common.build_tmp_dir() dir=self.common.build_tmp_dir()
) )
self.gzip_filename = os.path.join(self.gzip_tmp_dir.name, "file.gz")
self._gzip_compress( self._gzip_compress(
self.download_filename, self.gzip_file.name, 6, processed_size_callback self.download_filename, self.gzip_filename, 6, processed_size_callback
) )
self.gzip_filesize = os.path.getsize(self.gzip_file.name) self.gzip_filesize = os.path.getsize(self.gzip_filename)
with open(self.gzip_file.name, "rb") as f: with open(self.gzip_filename, "rb") as f:
self.gzip_etag = make_etag(f) self.gzip_etag = make_etag(f)
self.is_zipped = False self.is_zipped = False
# Cleanup this tempfile # Cleanup this tempfile
self.web.cleanup_tempfiles.append(self.gzip_file) self.web.cleanup_tempdirs.append(self.gzip_tmp_dir)
else: else:
# Zip up the files and folders # Zip up the files and folders