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

Two robustness changes for formatting custom series indices

Browse Source
This commit is contained in:
Charles Haley 2010-10-06 09:28:05 +01:00
parent 780bd84d29
commit b40e5bba6e
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -461,7 +461,7 @@ class Metadata(object):
v = self.series_index if val is None else val v = self.series_index if val is None else val
try: try:
x = float(v) x = float(v)
except ValueError: except ValueError, TypeError:
x = 1 x = 1
return fmt_sidx(x) return fmt_sidx(x)
@ -516,8 +516,9 @@ class Metadata(object):
if datatype == 'text' and cmeta['is_multiple']: if datatype == 'text' and cmeta['is_multiple']:
res = u', '.join(res) res = u', '.join(res)
elif datatype == 'series' and series_with_index: elif datatype == 'series' and series_with_index:
res = res + \ if self.get_extra(key):
' [%s]'%self.format_series_index(val=self.get_extra(key)) res = res + \
' [%s]'%self.format_series_index(val=self.get_extra(key))
elif datatype == 'datetime': elif datatype == 'datetime':
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':