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

Try and fix closing the request for a valid upload post-timer expiry, whilst still rejecting subsequent uploads

Browse source
This commit is contained in:
Miguel Jacq 2018-11-13 14:42:26 +11:00
parent b27007b20d
commit 005d2d0af7
1 changed files with 29 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

18
onionshare/web/receive_mode.py
View file

@ -244,14 +244,13 @@ class ReceiveModeRequest(Request):
if self.path == '/upload':
self.upload_request = True
# Prevent new uploads if we've said so (timer expired)
if not self.web.receive_mode.can_upload:
self.upload_request = False
if self.upload_request:
# A dictionary that maps filenames to the bytes uploaded so far
self.progress = {}
# Prevent new uploads if we've said so (timer expired)
if self.web.receive_mode.can_upload:
# Create an upload_id, attach it to the request
self.upload_id = self.web.receive_mode.upload_count
@ -296,13 +295,16 @@ class ReceiveModeRequest(Request):
Closing the request.
"""
super(ReceiveModeRequest, self).close()
if self.upload_request:
try:
upload_id = self.upload_id
self.web.common.log('ReceiveModeWeb', 'We finished our upload')
# Inform the GUI that the upload has finished
self.web.add_request(self.web.REQUEST_UPLOAD_FINISHED, self.path, {
'id': self.upload_id
'id': upload_id
})
self.web.receive_mode.uploads_in_progress.remove(self.upload_id)
self.web.receive_mode.uploads_in_progress.remove(upload_id)
except AttributeError:
pass
def file_write_func(self, filename, length):
"""