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

More granular progress reporting during bulk metadata download

Browse Source
This commit is contained in:
Kovid Goyal 2012-04-02 18:24:15 +05:30
parent e3873e4254
commit 945a8e3ae8
1 changed files with 76 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,6 +9,7 @@ __docformat__ = 'restructuredtext en'
import os, time, shutil import os, time, shutil
from functools import partial from functools import partial
from threading import Thread
from PyQt4.Qt import (QIcon, QDialog, from PyQt4.Qt import (QIcon, QDialog,
QDialogButtonBox, QLabel, QGridLayout, QPixmap, Qt) QDialogButtonBox, QLabel, QGridLayout, QPixmap, Qt)
@ -169,6 +170,36 @@ class HeartBeat(object):
self.last_time = time.time() self.last_time = time.time()
return True return True
class Notifier(Thread):
def __init__(self, notifications, title_map, tdir, total):
Thread.__init__(self)
self.daemon = True
self.notifications, self.title_map = notifications, title_map
self.tdir, self.total = tdir, total
self.seen = set()
self.keep_going = True
def run(self):
while self.keep_going:
try:
names = os.listdir(self.tdir)
except:
pass
else:
for x in names:
if x.endswith('.log'):
try:
book_id = int(x.partition('.')[0])
except:
continue
if book_id not in self.seen and book_id in self.title_map:
self.seen.add(book_id)
self.notifications.put((
float(len(self.seen))/self.total,
_('Processed %s')%self.title_map[book_id]))
time.sleep(1)
def download(all_ids, tf, db, do_identify, covers, ensure_fields, def download(all_ids, tf, db, do_identify, covers, ensure_fields,
log=None, abort=None, notifications=None): log=None, abort=None, notifications=None):
batch_size = 10 batch_size = 10
@ -184,7 +215,10 @@ def download(all_ids, tf, db, do_identify, covers, ensure_fields,
all_failed = True all_failed = True
aborted = False aborted = False
count = 0 count = 0
notifier = Notifier(notifications, title_map, tdir, len(all_ids))
notifier.start()
try:
for ids in batches: for ids in batches:
if abort.is_set(): if abort.is_set():
log.error('Aborting...') log.error('Aborting...')
@ -206,9 +240,6 @@ def download(all_ids, tf, db, do_identify, covers, ensure_fields,
'traceback: \n\n'+e.orig_tb) 'traceback: \n\n'+e.orig_tb)
raise raise
count += batch_size count += batch_size
notifications.put((count/len(ids),
_('Downloaded %(num)d of %(tot)d')%dict(
num=count, tot=len(all_ids))))
fids, fcovs, allf = ret['result'] fids, fcovs, allf = ret['result']
if not allf: if not allf:
@ -229,4 +260,7 @@ def download(all_ids, tf, db, do_identify, covers, ensure_fields,
log('Download complete, with %d failures'%len(failed_ids)) log('Download complete, with %d failures'%len(failed_ids))
return (aborted, ans, tdir, tf, failed_ids, failed_covers, title_map, return (aborted, ans, tdir, tf, failed_ids, failed_covers, title_map,
lm_map, all_failed) lm_map, all_failed)
finally:
notifier.keep_going = False