Rename close_after_seconds class to ShutdownTimer

This commit is contained in:
Micah Lee 2018-03-08 05:50:23 -08:00
parent 2e6538b7f8
commit 49e352d131
No known key found for this signature in database
GPG Key ID: 403C2657CD994F73
3 changed files with 5 additions and 3 deletions

View File

@ -225,7 +225,7 @@ def dir_size(start_path):
return total_size
class close_after_seconds(threading.Thread):
class ShutdownTimer(threading.Thread):
"""
Background thread sleeps t hours and returns.
"""

View File

@ -21,6 +21,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
import os, shutil
from . import common, strings
from .common import ShutdownTimer
class OnionShare(object):
"""
@ -74,7 +75,7 @@ class OnionShare(object):
return
if self.shutdown_timeout > 0:
self.shutdown_timer = common.close_after_seconds(self.shutdown_timeout)
self.shutdown_timer = ShutdownTimer(self.shutdown_timeout)
self.onion_host = self.onion.start_onion_service(self.port)

View File

@ -24,6 +24,7 @@ import queue
from PyQt5 import QtCore, QtWidgets, QtGui
from onionshare import strings, common
from onionshare.common import ShutdownTimer
from onionshare.settings import Settings
from onionshare.onion import *
@ -468,7 +469,7 @@ class OnionShareGui(QtWidgets.QMainWindow):
self.timeout = now.secsTo(self.server_status.timeout)
# Set the shutdown timeout value
if self.timeout > 0:
self.app.shutdown_timer = common.close_after_seconds(self.timeout)
self.app.shutdown_timer = ShutdownTimer(self.timeout)
self.app.shutdown_timer.start()
# The timeout has actually already passed since the user clicked Start. Probably the Onion service took too long to start.
else: