| '+_('Status')+' | '+_('Title')+' | '+_('Author')+' | '+_('Comment')+' | URL |
|---|
'
for book in good_list:
- if 'status' in book:
- status = book['status']
- else:
- status = _('Good')
- htmllog = htmllog + '| ' + ' | '.join([escapehtml(status),escapehtml(book['title']),escapehtml(", ".join(book['author'])),escapehtml(book['comment']),book['url']]) + ' |
'
+ htmllog = htmllog + '| ' + ' | '.join([escapehtml(book['status']),escapehtml(book['title']),escapehtml(", ".join(book['author'])),escapehtml(book['comment']),book['url']]) + ' |
'
for book in bad_list:
- if 'status' in book:
- status = book['status']
- else:
- status = _('Bad')
- htmllog = htmllog + '| ' + ' | '.join([escapehtml(status),escapehtml(book['title']),escapehtml(", ".join(book['author'])),escapehtml(book['comment']),book['url']]) + ' |
'
+ htmllog = htmllog + '| ' + ' | '.join([escapehtml(book['status']),escapehtml(book['title']),escapehtml(", ".join(book['author'])),escapehtml(book['comment']),book['url']]) + ' |
'
htmllog = htmllog + '
'
@@ -2390,6 +2372,7 @@ class FanFicFarePlugin(InterfaceAction):
book['comments'] = '' # note this is the book comments.
book['good'] = True
+ book['status'] = 'Bad'
book['showerror'] = True # False when NotGoingToDownload is
# not-overwrite / not-update / skip
# -- what some would consider 'not an
@@ -2414,6 +2397,7 @@ class FanFicFarePlugin(InterfaceAction):
if book['uniqueurl'] in uniqueurls:
book['good'] = False
book['comment'] = _("Same story already included.")
+ book['status']=_('Skipped')
uniqueurls.add(book['uniqueurl'])
book['listorder']=i # BG d/l jobs don't come back in order.
# Didn't matter until anthologies & 'marked' successes
diff --git a/calibre-plugin/jobs.py b/calibre-plugin/jobs.py
index d63c6834..e88369f7 100644
--- a/calibre-plugin/jobs.py
+++ b/calibre-plugin/jobs.py
@@ -13,6 +13,7 @@ logger = logging.getLogger(__name__)
import traceback
from datetime import time
from StringIO import StringIO
+from collections import defaultdict
from calibre.utils.ipc.server import Server
from calibre.utils.ipc.job import ParallelJob
@@ -93,16 +94,39 @@ def do_download_worker(book_list,
logger.info(job.details)
if count >= total:
- ## ordering first by good vs bad, then by listorder.
- good_list = [ x for x in book_list if x['good'] ]
- bad_list = [ x for x in book_list if not x['good'] ]
- good_list = sorted(good_list,key=lambda x : x['listorder'])
- bad_list = sorted(bad_list,key=lambda x : x['listorder'])
+ book_list = sorted(book_list,key=lambda x : x['listorder'])
+ logger.info("\n"+_("Download Results:")+"\n%s\n"%("\n".join([ "%(status)s %(url)s %(comment)s" % book for book in book_list])))
- logger.info("\n"+_("Download Results:")+"\n%s\n"%("\n".join([ "%(url)s %(comment)s" % book for book in good_list+bad_list])))
+ good_lists = defaultdict(list)
+ bad_lists = defaultdict(list)
+ for book in book_list:
+ if book['good']:
+ good_lists[book['status']].append(book)
+ else:
+ bad_lists[book['status']].append(book)
- logger.info("\n"+_("Successful:")+"\n%s\n"%("\n".join([book['url'] for book in good_list])))
- logger.info("\n"+_("Unsuccessful:")+"\n%s\n"%("\n".join([book['url'] for book in bad_list])))
+ order = [_('Add'),
+ _('Update'),
+ _('Meta'),
+ _('Different URL'),
+ _('Rejected'),
+ _('Skipped'),
+ _('Bad'),
+ _('Error'),
+ ]
+ j = 0
+ for d in [ good_lists, bad_lists ]:
+ for status in order:
+ if d[status]:
+ l = d[status]
+ logger.info("\n"+status+"\n%s\n"%("\n".join([book['url'] for book in l])))
+ for book in l:
+ book['reportorder'] = j
+ j += 1
+ del d[status]
+ # just in case a status is added but doesn't appear in order.
+ for status in d.keys():
+ logger.info("\n"+status+"\n%s\n"%("\n".join([book['url'] for book in d[status]])))
break
server.close()
@@ -306,12 +330,14 @@ def do_download_for_worker(book,options,merge,notification=lambda x,y:x):
except NotGoingToDownload as d:
book['good']=False
+ book['status']=_('Bad')
book['showerror']=d.showerror
book['comment']=unicode(d)
book['icon'] = d.icon
except Exception as e:
book['good']=False
+ book['status']=_('Error')
book['comment']=unicode(e)
book['icon']='dialog_error.png'
book['status'] = _('Error')
diff --git a/calibre-plugin/translations/messages.pot b/calibre-plugin/translations/messages.pot
index 0a09160e..20ab7dbf 100644
--- a/calibre-plugin/translations/messages.pot
+++ b/calibre-plugin/translations/messages.pot
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2019-05-16 14:52+Central Daylight Time\n"
+"POT-Creation-Date: 2019-07-12 21:47+Central Daylight Time\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME