arsenetar/dupeguru
1
0
Fork 0
mirror of https://github.com/arsenetar/dupeguru.git synced 2024-11-14 11:39:03 +00:00
Code Releases Wiki Activity

Handle OS termination signals.

Browse Source
This commit is contained in:
Jocelyn Le Sage 2017-06-06 09:31:49 -04:00
parent a82a19e074
commit 73dbacace1
2 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qt/app.py
View File

@ -68,6 +68,8 @@ class DupeGuru(QObject):
self.directories_dialog.show() self.directories_dialog.show()
self.model.load() self.model.load()
self.SIGTERM.connect(self.handleSIGTERM)
# The timer scheme is because if the nag is not shown before the application is # The timer scheme is because if the nag is not shown before the application is
# completely initialized, the nag will be shown before the app shows up in the task bar # completely initialized, the nag will be shown before the app shows up in the task bar
# In some circumstances, the nag is hidden by other window, which may make the user think # In some circumstances, the nag is hidden by other window, which may make the user think
@ -166,6 +168,7 @@ class DupeGuru(QObject):
#--- Signals #--- Signals
willSavePrefs = pyqtSignal() willSavePrefs = pyqtSignal()
SIGTERM = pyqtSignal()
#--- Events #--- Events
def finishedLaunching(self): def finishedLaunching(self):
@ -212,6 +215,9 @@ class DupeGuru(QObject):
url = QUrl.fromLocalFile(op.abspath(op.join(base_path, 'index.html'))) url = QUrl.fromLocalFile(op.abspath(op.join(base_path, 'index.html')))
QDesktopServices.openUrl(url) QDesktopServices.openUrl(url)
def handleSIGTERM(self):
self.shutdown()
#--- model --> view #--- model --> view
def get_default(self, key): def get_default(self, key):
return self.prefs.get_value(key) return self.prefs.get_value(key)

25
run.py
View File

@ -20,6 +20,23 @@ from qt import dg_rc
from qt.platform import BASE_PATH from qt.platform import BASE_PATH
from core import __version__, __appname__ from core import __version__, __appname__
from signal import signal, SIGINT, SIGTERM, SIGQUIT
global dgapp
dgapp = None
def signalHandler(sig, frame):
global dgapp
if dgapp is None:
return
if sig in (SIGINT, SIGTERM, SIGQUIT):
dgapp.SIGTERM.emit()
def setUpSignals():
signal(SIGINT, signalHandler)
signal(SIGTERM, signalHandler)
signal(SIGQUIT, signalHandler)
def main(): def main():
app = QApplication(sys.argv) app = QApplication(sys.argv)
QCoreApplication.setOrganizationName('Hardcoded Software') QCoreApplication.setOrganizationName('Hardcoded Software')
@ -30,10 +47,18 @@ def main():
lang = settings.value('Language') lang = settings.value('Language')
locale_folder = op.join(BASE_PATH, 'locale') locale_folder = op.join(BASE_PATH, 'locale')
install_gettext_trans_under_qt(locale_folder, lang) install_gettext_trans_under_qt(locale_folder, lang)
# Handle OS signals
setUpSignals()
# Let the Python interpreter run every 500ms to handle signals.
from PyQt5.QtCore import QTimer
timer = QTimer()
timer.start(500)
timer.timeout.connect(lambda: None)
# Many strings are translated at import time, so this is why we only import after the translator # Many strings are translated at import time, so this is why we only import after the translator
# has been installed # has been installed
from qt.app import DupeGuru from qt.app import DupeGuru
app.setWindowIcon(QIcon(QPixmap(":/{0}".format(DupeGuru.LOGO_NAME)))) app.setWindowIcon(QIcon(QPixmap(":/{0}".format(DupeGuru.LOGO_NAME))))
global dgapp
dgapp = DupeGuru() dgapp = DupeGuru()
install_excepthook('https://github.com/hsoft/dupeguru/issues') install_excepthook('https://github.com/hsoft/dupeguru/issues')
result = app.exec() result = app.exec()