Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-08 10:44:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix db2.get_metadata to handle format correctly (it is already a list)

Browse Source 
Fix Metadata to put composite fields back where they belong
This commit is contained in:
Charles Haley 2010-09-23 17:18:49 +01:00
parent ea29f4b683
commit 36ce874081
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/ebooks/metadata/book/base.py
View File

@ -99,7 +99,7 @@ class Metadata(object):
continue continue
cf['#value#'] = 'RECURSIVE_COMPOSITE FIELD ' + field cf['#value#'] = 'RECURSIVE_COMPOSITE FIELD ' + field
cf['#value#'] = composite_formatter.safe_format( cf['#value#'] = composite_formatter.safe_format(
d['display']['composite_template'], cf['display']['composite_template'],
self, _('TEMPLATE ERROR')).strip() self, _('TEMPLATE ERROR')).strip()
return d['#value#'] return d['#value#']

4
src/calibre/library/database2.py
View File

@ -584,9 +584,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
mi.title_sort = self.title_sort(idx, index_is_id=index_is_id) mi.title_sort = self.title_sort(idx, index_is_id=index_is_id)
mi.formats = self.formats(idx, index_is_id=index_is_id, mi.formats = self.formats(idx, index_is_id=index_is_id,
verify_formats=False) verify_formats=False)
if hasattr(mi.formats, 'split'): if len(mi.formats) == 0:
mi.formats = mi.formats.split(',')
else:
mi.formats = None mi.formats = None
tags = self.tags(idx, index_is_id=index_is_id) tags = self.tags(idx, index_is_id=index_is_id)
if tags: if tags: