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 use of {formats} in save to disk templates. Fix some formatter functions causing plugboards to not validate.

Browse Source
This commit is contained in:
Kovid Goyal 2012-11-26 21:37:59 +05:30
commit b2e79fe47b
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,6 +20,7 @@ from calibre.ebooks.metadata import title_sort
from calibre.utils.date import parse_date, as_local_time from calibre.utils.date import parse_date, as_local_time
from calibre import strftime, prints, sanitize_file_name_unicode from calibre import strftime, prints, sanitize_file_name_unicode
from calibre.ptempfile import SpooledTemporaryFile from calibre.ptempfile import SpooledTemporaryFile
from calibre.db.lazy import FormatsList
plugboard_any_device_value = 'any device' plugboard_any_device_value = 'any device'
plugboard_any_format_value = 'any format' plugboard_any_format_value = 'any format'
@ -159,7 +160,7 @@ class Formatter(TemplateFormatter):
return self.composite_values[key] return self.composite_values[key]
if key in kwargs: if key in kwargs:
val = kwargs[key] val = kwargs[key]
if isinstance(val, list): if isinstance(val, list) or isinstance(val, FormatsList):
val = ','.join(val) val = ','.join(val)
return val.replace('/', '_').replace('\\', '_') return val.replace('/', '_').replace('\\', '_')
return '' return ''

2
src/calibre/utils/formatter.py
View File

@ -526,6 +526,8 @@ class ValidateFormatter(TemplateFormatter):
return self._validation_string return self._validation_string
def validate(self, x): def validate(self, x):
from calibre.ebooks.metadata.book.base import Metadata
self.book = Metadata('');
return self.vformat(x, [], {}) return self.vformat(x, [], {})
validation_formatter = ValidateFormatter() validation_formatter = ValidateFormatter()