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

Let the timer stop the share if there were no downloads, or all downloads are done

Browse Source
This commit is contained in:
Miguel Jacq 2017-12-05 11:18:26 +11:00
parent 884d8389ed
commit eaa37206e5
No known key found for this signature in database
GPG Key ID: EEA4341C6D97A0B6
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
onionshare/__init__.py
View File

@ -134,10 +134,12 @@ def main(cwd=None):
while t.is_alive():
if app.shutdown_timeout > 0:
# if the shutdown timer was set and has run out, stop the server
if not app.shutdown_timer.is_alive() and web.done:
print(strings._("close_on_timeout"))
web.stop(app.port)
break
if not app.shutdown_timer.is_alive():
# If there were no attempts to download the share, or all downloads are done, we can stop
if web.download_count == 0 or web.done:
print(strings._("close_on_timeout"))
web.stop(app.port)
break
# Allow KeyboardInterrupt exception to be handled with threads
# https://stackoverflow.com/questions/3788208/python-threading-ignores-keyboardinterrupt-exception
time.sleep(0.2)

8
onionshare_gui/onionshare_gui.py
View File

@ -427,7 +427,7 @@ class OnionShareGui(QtWidgets.QMainWindow):
if not web.get_stay_open():
self.server_status.stop_server()
self.server_status.shutdown_timeout_reset()
self.status_bar.showMessage(strings._('closing_automatically',True))
self.status_bar.showMessage(strings._('closing_automatically', True))
else:
if self.server_status.status == self.server_status.STATUS_STOPPED:
self.downloads.cancel_download(event["data"]["id"])
@ -445,10 +445,12 @@ class OnionShareGui(QtWidgets.QMainWindow):
if self.app.shutdown_timer and self.server_status.timer_enabled:
if self.timeout > 0:
if not self.app.shutdown_timer.is_alive():
if web.done:
# If there were no attempts to download the share, or all downloads are done, we can stop
if web.download_count == 0 or web.done:
self.server_status.stop_server()
self.status_bar.showMessage(strings._('close_on_timeout',True))
self.status_bar.showMessage(strings._('close_on_timeout', True))
self.server_status.shutdown_timeout_reset()
# A download is probably still running - hold off on stopping the share
else:
self.status_bar.showMessage(strings._('timeout_download_still_running', True))