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

Make get_components use precomputed values for composite columns. Improves performance and makes values computed with user-defined functions work.

Browse Source
This commit is contained in:
Charles Haley 2011-09-24 12:56:37 +02:00
parent 7b5f14462a
commit 1423e94c13
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -150,12 +150,21 @@ class Formatter(TemplateFormatter):
traceback.print_exc() traceback.print_exc()
b = None b = None
if b is not None and b['datatype'] == 'composite': if b is not None and b['datatype'] == 'composite':
val = b.get('#value#', None)
if val is not None:
return val.replace('/', '_').replace('\\', '_')
if key in self.composite_values: if key in self.composite_values:
self.composite_values[key] = val
return self.composite_values[key] return self.composite_values[key]
self.composite_values[key] = 'RECURSIVE_COMPOSITE FIELD (S2D) ' + key try:
self.composite_values[key] = \ # We really should not get here, but it is safer to try
self.vformat(b['display']['composite_template'], [], kwargs) self.composite_values[key] = 'RECURSIVE_COMPOSITE FIELD (S2D) ' + key
return self.composite_values[key] self.composite_values[key] = \
self.vformat(b['display']['composite_template'],
[], kwargs).replace('/', '_').replace('\\', '_')
return self.composite_values[key]
except Exception, e:
return unicode(e)
if key in kwargs: if key in kwargs:
val = kwargs[key] val = kwargs[key]
if isinstance(val, list): if isinstance(val, list):
@ -170,6 +179,13 @@ def get_components(template, mi, id, timefmt='%b %Y', length=250,
sanitize_func=ascii_filename, replace_whitespace=False, sanitize_func=ascii_filename, replace_whitespace=False,
to_lowercase=False, safe_format=True): to_lowercase=False, safe_format=True):
# Note: the mi argument is assumed to be an instance of Metadata returned
# by db.get_metadata(). Reason: the composite columns should have already
# been evaluated, which get_metadata does. If the mi is something else and
# if the template uses composite columns, then a best-efforts attempt is
# made to evaluate them. This will fail if the template uses a user-defined
# template function.
tsorder = tweaks['save_template_title_series_sorting'] tsorder = tweaks['save_template_title_series_sorting']
format_args = FORMAT_ARGS.copy() format_args = FORMAT_ARGS.copy()
format_args.update(mi.all_non_none_fields()) format_args.update(mi.all_non_none_fields())