Backup_Repos/FanFicFare
1
0
Fork 0
mirror of https://github.com/JimmXinu/FanFicFare.git synced 2025-12-06 08:52:55 +01:00
Code Issues Projects Releases Wiki Activity

Really fix 'Don't trust 100% to count jobs finished.'

Browse source
This commit is contained in:
Jim Miller 2021-02-09 19:08:01 -06:00
parent 760a5cbc9c
commit 43cf842721
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
calibre-plugin/jobs.py
View file

@ -96,10 +96,13 @@ def do_download_worker(book_list,
try: try:
## msg = book['url'] ## msg = book['url']
(percent,msg) = job.notifications.get_nowait() (percent,msg) = job.notifications.get_nowait()
logger.debug("%s<-%s"%(percent,msg)) # logger.debug("%s<-%s"%(percent,msg))
totals[msg] = percent/len(totals) if percent == 10.0: # Only when signaling d/l done.
if job.is_finished:
count += 1 count += 1
totals[msg] = 1.0/len(totals)
logger.info("Finished: %s"%msg)
else:
totals[msg] = percent/len(totals)
notification(max(0.01,sum(totals.values())), _('%(count)d of %(total)d stories finished downloading')%{'count':count,'total':len(totals)}) notification(max(0.01,sum(totals.values())), _('%(count)d of %(total)d stories finished downloading')%{'count':count,'total':len(totals)})
except Empty: except Empty:
pass pass
@ -166,7 +169,7 @@ def do_download_site(site,book_list,options,merge,notification=lambda x,y:x):
for book in book_list: for book in book_list:
logger.info("%s"%book['url']) logger.info("%s"%book['url'])
retval.append(do_download_for_worker(book,options,merge,notification)) retval.append(do_download_for_worker(book,options,merge,notification))
notification(1.0,book['url']) notification(10.0,book['url'])
return retval return retval
def do_download_for_worker(book,options,merge,notification=lambda x,y:x): def do_download_for_worker(book,options,merge,notification=lambda x,y:x):