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

Switch bulk download of metadata to use a singleSHot architecture instead of a QTimer

Browse Source
This commit is contained in:
Kovid Goyal 2011-02-05 11:14:28 -07:00
parent b5fd4a07d8
commit 0a267d2932
1 changed files with 29 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/calibre/gui2/metadata/bulk_download.py
View File

@ -11,7 +11,7 @@ from threading import Thread
from Queue import Queue, Empty from Queue import Queue, Empty
from functools import partial from functools import partial
from PyQt4.Qt import QObject, Qt, pyqtSignal, QTimer, QDialog, \ from PyQt4.Qt import QObject, QTimer, QDialog, \
QVBoxLayout, QTextBrowser, QLabel, QGroupBox, QDialogButtonBox QVBoxLayout, QTextBrowser, QLabel, QGroupBox, QDialogButtonBox
from calibre.ebooks.metadata.fetch import search, get_social_metadata from calibre.ebooks.metadata.fetch import search, get_social_metadata
@ -163,27 +163,23 @@ class DownloadMetadata(Thread):
class DoDownload(QObject): class DoDownload(QObject):
idle_process = pyqtSignal()
def __init__(self, parent, title, db, ids, get_covers, set_metadata=True, def __init__(self, parent, title, db, ids, get_covers, set_metadata=True,
get_social_metadata=True): get_social_metadata=True):
QObject.__init__(self, parent) QObject.__init__(self, parent)
self.pd = ProgressDialog(title, min=0, max=0, parent=parent) self.pd = ProgressDialog(title, min=0, max=0, parent=parent)
self.pd.canceled_signal.connect(self.cancel) self.pd.canceled_signal.connect(self.cancel)
self.idle_process.connect(self.do_one, type=Qt.QueuedConnection)
self.downloader = None self.downloader = None
self.create = partial(DownloadMetadata, db, ids, get_covers, self.create = partial(DownloadMetadata, db, ids, get_covers,
set_metadata=set_metadata, set_metadata=set_metadata,
get_social_metadata=get_social_metadata) get_social_metadata=get_social_metadata)
self.timer = QTimer(self)
self.get_covers = get_covers self.get_covers = get_covers
self.timer.timeout.connect(self.do_one, type=Qt.QueuedConnection)
self.db = db self.db = db
self.updated = set([]) self.updated = set([])
self.total = len(ids) self.total = len(ids)
self.keep_going = True
def exec_(self): def exec_(self):
self.timer.start(50) QTimer.singleShot(50, self.do_one)
ret = self.pd.exec_() ret = self.pd.exec_()
if getattr(self.downloader, 'exception', None) is not None and \ if getattr(self.downloader, 'exception', None) is not None and \
ret == self.pd.Accepted: ret == self.pd.Accepted:
@ -194,11 +190,14 @@ class DoDownload(QObject):
return ret return ret
def cancel(self, *args): def cancel(self, *args):
self.timer.stop() self.keep_going = False
self.downloader.keep_going = False self.downloader.keep_going = False
self.pd.reject() self.pd.reject()
def do_one(self): def do_one(self):
try:
if not self.keep_going:
return
if self.downloader is None: if self.downloader is None:
self.downloader = self.create() self.downloader = self.create()
self.downloader.start() self.downloader.start()
@ -210,7 +209,6 @@ class DoDownload(QObject):
except Empty: except Empty:
pass pass
if not self.downloader.is_alive(): if not self.downloader.is_alive():
self.timer.stop()
while True: while True:
try: try:
r = self.downloader.results.get_nowait() r = self.downloader.results.get_nowait()
@ -218,6 +216,11 @@ class DoDownload(QObject):
except Empty: except Empty:
break break
self.pd.accept() self.pd.accept()
return
except:
self.cancel()
raise
QTimer.singleShot(50, self.do_one)
def handle_result(self, r): def handle_result(self, r):
id_, typ, ok, title = r id_, typ, ok, title = r