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

Actually tell the GUI the progess

Browse Source
This commit is contained in:
Micah Lee 2018-09-21 17:08:11 -07:00
parent bacd2a1be6
commit 4d125bd3dc
No known key found for this signature in database
GPG Key ID: 403C2657CD994F73
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
onionshare/web/share_mode.py
View File

@ -132,8 +132,10 @@ class ShareModeWeb(object):
use_gzip = self.should_use_gzip() use_gzip = self.should_use_gzip()
if use_gzip: if use_gzip:
file_to_download = self.gzip_filename file_to_download = self.gzip_filename
filesize = self.gzip_filesize
else: else:
file_to_download = self.download_filename file_to_download = self.download_filename
filesize = self.download_filesize
# Tell GUI the download started # Tell GUI the download started
self.web.add_request(self.web.REQUEST_STARTED, path, { self.web.add_request(self.web.REQUEST_STARTED, path, {
@ -173,7 +175,7 @@ class ShareModeWeb(object):
# tell GUI the progress # tell GUI the progress
downloaded_bytes = fp.tell() downloaded_bytes = fp.tell()
percent = (1.0 * downloaded_bytes / self.download_filesize) * 100 percent = (1.0 * downloaded_bytes / filesize) * 100
# only output to stdout if running onionshare in CLI mode, or if using Linux (#203, #304) # only output to stdout if running onionshare in CLI mode, or if using Linux (#203, #304)
if not self.web.is_gui or self.common.platform == 'Linux' or self.common.platform == 'BSD': if not self.web.is_gui or self.common.platform == 'Linux' or self.common.platform == 'BSD':
@ -219,9 +221,7 @@ class ShareModeWeb(object):
r = Response(generate()) r = Response(generate())
if use_gzip: if use_gzip:
r.headers.set('Content-Encoding', 'gzip') r.headers.set('Content-Encoding', 'gzip')
r.headers.set('Content-Length', self.gzip_filesize) r.headers.set('Content-Length', filesize)
else:
r.headers.set('Content-Length', self.download_filesize)
r.headers.set('Content-Disposition', 'attachment', filename=basename) r.headers.set('Content-Disposition', 'attachment', filename=basename)
r = self.web.add_security_headers(r) r = self.web.add_security_headers(r)
# guess content type # guess content type