phantom/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-01-25 02:32:58 -03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

If no files are uploaded, delete the empty receive mode dir that was created

Browse source
This commit is contained in:
Micah Lee 2021-04-30 15:57:11 -07:00
parent 95e6985f86
commit 89bed3c5ac
No known key found for this signature in database
GPG key ID: 403C2657CD994F73
1 changed files with 27 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
cli/onionshare_cli/web/receive_mode.py
View file

@ -536,27 +536,35 @@ class ReceiveModeRequest(Request):
if self.upload_request: if self.upload_request:
self.web.common.log("ReceiveModeRequest", "close") self.web.common.log("ReceiveModeRequest", "close")
try: try:
if self.told_gui_about_request: if self.told_gui_about_request:
history_id = self.history_id history_id = self.history_id
if ( if (
not self.web.stop_q.empty() not self.web.stop_q.empty()
or not self.progress[self.filename]["complete"] or not self.progress[self.filename]["complete"]
): ):
# Inform the GUI that the upload has canceled # Inform the GUI that the upload has canceled
self.web.add_request( self.web.add_request(
self.web.REQUEST_UPLOAD_CANCELED, self.path, {"id": history_id} self.web.REQUEST_UPLOAD_CANCELED,
) self.path,
else: {"id": history_id},
# Inform the GUI that the upload has finished )
self.web.add_request( else:
self.web.REQUEST_UPLOAD_FINISHED, self.path, {"id": history_id} # Inform the GUI that the upload has finished
) self.web.add_request(
self.web.receive_mode.uploads_in_progress.remove(history_id) self.web.REQUEST_UPLOAD_FINISHED,
self.path,
{"id": history_id},
)
self.web.receive_mode.uploads_in_progress.remove(history_id)
except AttributeError: except AttributeError:
pass pass
# If no files were written to self.receive_mode_dir, delete it
if len(os.listdir(self.receive_mode_dir)) == 0:
os.rmdir(self.receive_mode_dir)
def file_write_func(self, filename, length): def file_write_func(self, filename, length):
""" """