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 template bugs introduced by using + instead of '%s'

Browse Source
This commit is contained in:
Charles Haley 2010-09-22 20:56:08 +01:00
parent bd8a206219
commit f280cc956f
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,9 +43,9 @@ class SafeFormat(string.Formatter):
ign, v = mi.format_field(key, series_with_index=False) ign, v = mi.format_field(key, series_with_index=False)
if v is None: if v is None:
return '' return ''
if v is '': if v == '':
return '' return ''
return prefix + v + suffix return prefix + unicode(v) + suffix
except: except:
return key return key

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

@ -101,7 +101,8 @@ def preprocess_template(template):
template = template.decode(preferred_encoding, 'replace') template = template.decode(preferred_encoding, 'replace')
return template return template
template_value_re = re.compile(r'^([^\|]*(?=\|))(?:\|?)([^\|]*)(?:\|?)((?<=\|).*?)$') template_value_re = re.compile(r'^([^\|]*(?=\|))(?:\|?)([^\|]*)(?:\|?)((?<=\|).*?)$',
flags= re.UNICODE)
def explode_string_template_value(key): def explode_string_template_value(key):
try: try:
@ -120,7 +121,7 @@ class SafeFormat(string.Formatter):
try: try:
prefix, key, suffix = explode_string_template_value(key) prefix, key, suffix = explode_string_template_value(key)
if kwargs[key]: if kwargs[key]:
return prefix + kwargs[key] + suffix return prefix + unicode(kwargs[key]) + suffix
return '' return ''
except: except:
return '' return ''