Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2024-12-28 08:49:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Try to fix logic handling last upload after timer expiry

Browse Source
This commit is contained in:
Miguel Jacq 2018-10-02 08:22:08 +10:00
parent e9148ddb49
commit 61d2e6cc5f
No known key found for this signature in database
GPG Key ID: EEA4341C6D97A0B6
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
onionshare/web/receive_mode.py
View File

@ -243,7 +243,11 @@ class ReceiveModeRequest(Request):
if self.path == '/upload': if self.path == '/upload':
self.upload_request = True self.upload_request = True
if self.upload_request and self.web.receive_mode.can_upload: # 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 # A dictionary that maps filenames to the bytes uploaded so far
self.progress = {} self.progress = {}
@ -290,16 +294,11 @@ class ReceiveModeRequest(Request):
""" """
super(ReceiveModeRequest, self).close() super(ReceiveModeRequest, self).close()
if self.upload_request: if self.upload_request:
try: # Inform the GUI that the upload has finished
upload_id = self.upload_id self.web.add_request(self.web.REQUEST_UPLOAD_FINISHED, self.path, {
# Inform the GUI that the upload has finished 'id': self.upload_id
self.web.add_request(self.web.REQUEST_UPLOAD_FINISHED, self.path, { })
'id': upload_id
})
except AttributeError:
# We may not have got an upload_id (e.g uploads were rejected)
pass
def file_write_func(self, filename, length): def file_write_func(self, filename, length):
""" """