mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-09 03:04:10 -04:00
Fix #7888: empty tags list throws exception in save_to_disk, converting the result to 'tags'
This commit is contained in:
parent
881bfef0f2
commit
c260cb052b
@ -119,10 +119,8 @@ class SafeFormat(TemplateFormatter):
|
|||||||
try:
|
try:
|
||||||
b = self.book.get_user_metadata(key, False)
|
b = self.book.get_user_metadata(key, False)
|
||||||
except:
|
except:
|
||||||
if DEBUG:
|
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':
|
||||||
if key in self.composite_values:
|
if key in self.composite_values:
|
||||||
return self.composite_values[key]
|
return self.composite_values[key]
|
||||||
@ -135,8 +133,7 @@ class SafeFormat(TemplateFormatter):
|
|||||||
return val.replace('/', '_').replace('\\', '_')
|
return val.replace('/', '_').replace('\\', '_')
|
||||||
return ''
|
return ''
|
||||||
except:
|
except:
|
||||||
if DEBUG:
|
traceback.print_exc()
|
||||||
traceback.print_exc()
|
|
||||||
return key
|
return key
|
||||||
|
|
||||||
def get_components(template, mi, id, timefmt='%b %Y', length=250,
|
def get_components(template, mi, id, timefmt='%b %Y', length=250,
|
||||||
@ -155,6 +152,8 @@ def get_components(template, mi, id, timefmt='%b %Y', length=250,
|
|||||||
format_args['tags'] = mi.format_tags()
|
format_args['tags'] = mi.format_tags()
|
||||||
if format_args['tags'].startswith('/'):
|
if format_args['tags'].startswith('/'):
|
||||||
format_args['tags'] = format_args['tags'][1:]
|
format_args['tags'] = format_args['tags'][1:]
|
||||||
|
else:
|
||||||
|
format_args['tags'] = ''
|
||||||
if mi.series:
|
if mi.series:
|
||||||
format_args['series'] = tsfmt(mi.series)
|
format_args['series'] = tsfmt(mi.series)
|
||||||
if mi.series_index is not None:
|
if mi.series_index is not None:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user