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

Fix mutually recursive fields in save_to_disk.

Browse Source 
Fix mistake in any_format template handling in save_to_disk
This commit is contained in:
Charles Haley 2010-09-28 15:13:30 +01:00
parent cca39d2e73
commit 8a94c2194e
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/calibre/library/save_to_disk.py
View File

@ -111,18 +111,31 @@ class SafeFormat(TemplateFormatter):
''' '''
Provides a format function that substitutes '' for any missing value Provides a format function that substitutes '' for any missing value
''' '''
composite_values = {}
def get_value(self, key, args, kwargs): def get_value(self, key, args, kwargs):
try: try:
b = self.book.get_user_metadata(key, False) b = self.book.get_user_metadata(key, False)
key = key.lower() key = key.lower()
if b is not None and b['datatype'] == 'composite': if b is not None and b['datatype'] == 'composite':
return self.vformat(b['display']['composite_template'], [], kwargs) if key in self.composite_values:
return self.composite_values[key]
self.composite_values[key] = 'RECURSIVE_COMPOSITE FIELD (S2D) ' + key
self.composite_values[key] = \
self.vformat(b['display']['composite_template'], [], kwargs)
return self.composite_values[key]
if kwargs[key]: if kwargs[key]:
return self.sanitize(kwargs[key.lower()]) return self.sanitize(kwargs[key.lower()])
return '' return ''
except: except:
return '' return ''
def safe_format(self, fmt, kwargs, error_value, book, sanitize=None):
self.composite_values = {}
return TemplateFormatter.safe_format(self, fmt, kwargs, error_value,
book, sanitize)
safe_formatter = SafeFormat() safe_formatter = SafeFormat()
def get_components(template, mi, id, timefmt='%b %Y', length=250, def get_components(template, mi, id, timefmt='%b %Y', length=250,
@ -243,10 +256,12 @@ def save_book_to_disk(id, db, root, opts, length):
cpb = None cpb = None
if fmt in plugboards: if fmt in plugboards:
cpb = plugboards[fmt] cpb = plugboards[fmt]
elif plugboard_any_format_value in plugboards: if dev_name in cpb:
cpb = cpb[dev_name]
else:
cpb = None
if cpb is None and plugboard_any_format_value in plugboards:
cpb = plugboards[plugboard_any_format_value] cpb = plugboards[plugboard_any_format_value]
# must find a save_to_disk entry for this format
if cpb is not None:
if dev_name in cpb: if dev_name in cpb:
cpb = cpb[dev_name] cpb = cpb[dev_name]
else: else: