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

...

Browse Source
This commit is contained in:
Kovid Goyal 2010-09-22 16:16:04 -06:00
commit 564c16de9f
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,7 +43,7 @@ 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 + v + suffix
except: except:
@ -444,7 +444,7 @@ class Metadata(object):
res = format_date(res, cmeta['display'].get('date_format','dd MMM yyyy')) res = format_date(res, cmeta['display'].get('date_format','dd MMM yyyy'))
elif datatype == 'bool': elif datatype == 'bool':
res = _('Yes') if res else _('No') res = _('Yes') if res else _('No')
return (name, res, orig_res, cmeta) return (name, unicode(res), orig_res, cmeta)
if key in field_metadata and field_metadata[key]['kind'] == 'field': if key in field_metadata and field_metadata[key]['kind'] == 'field':
res = self.get(key, None) res = self.get(key, None)
@ -462,7 +462,7 @@ class Metadata(object):
res = res + ' [%s]'%self.format_series_index() res = res + ' [%s]'%self.format_series_index()
elif datatype == 'datetime': elif datatype == 'datetime':
res = format_date(res, fmeta['display'].get('date_format','dd MMM yyyy')) res = format_date(res, fmeta['display'].get('date_format','dd MMM yyyy'))
return (name, res, orig_res, fmeta) return (name, unicode(res), orig_res, fmeta)
return (None, None, None, None) return (None, None, None, None)

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 ''