Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Replace QThread with python Thread

Browse Source
This commit is contained in:
Kovid Goyal 2014-11-06 16:53:51 +05:30
parent 1abbe27bd8
commit ab046b1d23
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/gui2/ui.py
View File

@ -888,7 +888,7 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin, # {{{
if write_settings: if write_settings:
self.write_settings() self.write_settings()
self.check_messages_timer.stop() self.check_messages_timer.stop()
self.update_checker.terminate() self.update_checker.shutdown()
self.listener.close() self.listener.close()
self.job_manager.server.close() self.job_manager.server.close()
self.job_manager.threaded_server.close() self.job_manager.threaded_server.close()

26
src/calibre/gui2/update.py
View File

@ -3,8 +3,9 @@ __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
import re, binascii, cPickle import re, binascii, cPickle
from future_builtins import map from future_builtins import map
from threading import Thread, Event
from PyQt5.Qt import (QThread, pyqtSignal, Qt, QUrl, QDialog, QGridLayout, from PyQt5.Qt import (QObject, pyqtSignal, Qt, QUrl, QDialog, QGridLayout,
QLabel, QCheckBox, QDialogButtonBox, QIcon, QPixmap) QLabel, QCheckBox, QDialogButtonBox, QIcon, QPixmap)
import mechanize import mechanize
@ -44,16 +45,22 @@ def get_newest_version():
ans = tuple(map(int, (m.group(1), m.group(2), m.group(3)))) ans = tuple(map(int, (m.group(1), m.group(2), m.group(3))))
return ans return ans
class CheckForUpdates(QThread): class Signal(QObject):
update_found = pyqtSignal(object, object) update_found = pyqtSignal(object, object)
INTERVAL = 24*60*60
class CheckForUpdates(Thread):
INTERVAL = 24*60*60 # seconds
daemon = True
def __init__(self, parent): def __init__(self, parent):
QThread.__init__(self, parent) Thread.__init__(self)
self.shutdown_event = Event()
self.signal = Signal(parent)
def run(self): def run(self):
while True: while not self.shutdown_event.is_set():
calibre_update_version = NO_CALIBRE_UPDATE calibre_update_version = NO_CALIBRE_UPDATE
plugins_update_found = 0 plugins_update_found = 0
try: try:
@ -69,8 +76,11 @@ class CheckForUpdates(QThread):
except Exception as e: except Exception as e:
prints('Failed to check for plugin update:', as_unicode(e)) prints('Failed to check for plugin update:', as_unicode(e))
if calibre_update_version != NO_CALIBRE_UPDATE or plugins_update_found > 0: if calibre_update_version != NO_CALIBRE_UPDATE or plugins_update_found > 0:
self.update_found.emit(calibre_update_version, plugins_update_found) self.signal.update_found.emit(calibre_update_version, plugins_update_found)
self.sleep(self.INTERVAL) self.shutdown_event.wait(self.INTERVAL)
def shutdown(self):
self.shutdown_event.set()
class UpdateNotification(QDialog): class UpdateNotification(QDialog):
@ -141,7 +151,7 @@ class UpdateMixin(object):
self.last_newest_calibre_version = NO_CALIBRE_UPDATE self.last_newest_calibre_version = NO_CALIBRE_UPDATE
if not opts.no_update_check: if not opts.no_update_check:
self.update_checker = CheckForUpdates(self) self.update_checker = CheckForUpdates(self)
self.update_checker.update_found.connect(self.update_found, self.update_checker.signal.update_found.connect(self.update_found,
type=Qt.QueuedConnection) type=Qt.QueuedConnection)
self.update_checker.start() self.update_checker.start()