Backup_Repos/calibre
1
0
Fork 0
mirror of git://github.com/kovidgoyal/calibre.git synced 2026-05-08 18:23:47 +02:00
Code Issues Projects Releases Wiki Activity

...

Browse source
This commit is contained in:
Kovid Goyal 2013-02-13 13:49:21 +05:30
parent 604857e26e
commit 5e0e77ec4a
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/calibre/ebooks/oeb/polish/main.py
View file

@ -126,7 +126,7 @@ def gui_polish(data):
file_map = {x:x for x in files}
opts = ALL_OPTS.copy()
opts.update(data)
O = namedtuple('Options', ' '.join(data.iterkeys()))
O = namedtuple('Options', ' '.join(ALL_OPTS.iterkeys()))
opts = O(**opts)
log = Log(level=Log.DEBUG)
report = []

14
src/calibre/gui2/actions/polish.py
View file

@ -40,7 +40,9 @@ def __init__(self, db, book_id_map, parent=None):
'metadata':_('<h3>Updating metadata</h3>'
'<p>This will update all metadata and covers in the'
' ebook files to match the current metadata in the'
' calibre library.</p><p>Note that most ebook'
' calibre library.</p><p>If the ebook file does not have'
' an identifiable cover, a new cover is inserted.</p>'
' <p>Note that most ebook'
' formats are not capable of supporting all the'
' metadata in calibre.</p>'),
}
@ -52,11 +54,11 @@ def __init__(self, db, book_id_map, parent=None):
l.addWidget(la, 0, 0, 1, 2)
count = 0
self.actions = OrderedDict([
self.all_actions = OrderedDict([
('subset', _('Subset all embedded fonts')),
('metadata', _('Update metadata in book files')),
])
for name, text in self.actions.iteritems():
for name, text in self.all_actions.iteritems():
count += 1
x = QCheckBox(text, self)
l.addWidget(x, count, 0, 1, 1)
@ -94,7 +96,7 @@ def help_link_activated(self, link):
def accept(self):
self.actions = ac = {}
something = False
for action in self.actions:
for action in self.all_actions:
ac[action] = bool(getattr(self, 'opt_'+action).isChecked())
if ac[action]:
something = True
@ -156,7 +158,7 @@ def do_book(self, num, book_id, formats):
desc = ngettext(_('Polish %s')%mi.title,
_('Polish book %(nums)s of %(tot)s (%(title)s)')%dict(
num=num, tot=len(self.book_id_map),
nums=num, tot=len(self.book_id_map),
title=mi.title), len(self.book_id_map))
if hasattr(self, 'pd'):
self.pd.set_msg(_('Queueing book %(nums)s of %(tot)s (%(title)s)')%dict(
@ -213,7 +215,7 @@ def polish_books(self):
return
d = Polish(self.gui.library_view.model().db, book_id_map, parent=self.gui)
if d.exec_() == d.Accepted and d.jobs:
for desc, data, book_id, base, files in reversed(d.jobs):
for desc, data, book_id, base in reversed(d.jobs):
job = self.gui.job_manager.run_job(
Dispatcher(self.book_polished), 'gui_polish', args=(data,),
description=desc)