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

...

Browse Source
This commit is contained in:
Kovid Goyal 2011-05-05 09:03:14 -06:00
commit f79a70c50a
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/devices/kindle/apnx.py
View File

@ -164,7 +164,7 @@ class APNXBuilder(object):
if c == '/': if c == '/':
closing = True closing = True
continue continue
elif c in ('d', 'p'): elif c == 'p':
if closing: if closing:
in_p = False in_p = False
else: else:

2
src/calibre/ebooks/metadata/extz.py
View File

@ -70,7 +70,7 @@ def set_metadata(stream, mi):
# Update the metadata. # Update the metadata.
old_mi = opf.to_book_metadata() old_mi = opf.to_book_metadata()
old_mi.smart_update(mi) old_mi.smart_update(mi)
opf.smart_update(metadata_to_opf(old_mi)) opf.smart_update(metadata_to_opf(old_mi), replace_metadata=True)
newopf = StringIO(opf.render()) newopf = StringIO(opf.render())
safe_replace(stream, opf_path, newopf, extra_replacements=replacements, add_missing=True) safe_replace(stream, opf_path, newopf, extra_replacements=replacements, add_missing=True)

14
src/calibre/gui2/library/views.py
View File

@ -439,10 +439,16 @@ class BooksView(QTableView): # {{{
if tweaks['sort_columns_at_startup'] is not None: if tweaks['sort_columns_at_startup'] is not None:
sh = [] sh = []
for c,d in tweaks['sort_columns_at_startup']: try:
if not isinstance(d, bool): for c,d in tweaks['sort_columns_at_startup']:
d = True if d == 0 else False if not isinstance(d, bool):
sh.append((c, d)) d = True if d == 0 else False
sh.append((c, d))
except:
# Ignore invalid tweak values as users seem to often get them
# wrong
import traceback
traceback.print_exc()
old_state['sort_history'] = sh old_state['sort_history'] = sh
self.apply_state(old_state) self.apply_state(old_state)