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

Merge branch 'master' of https://github.com/cbhaley/calibre

Browse Source
This commit is contained in:
Kovid Goyal 2017-05-28 14:27:44 +05:30
commit c469a0fa37
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/calibre/utils/formatter_functions.py
View File

@ -791,9 +791,12 @@ class BuiltinFormatsModtimes(BuiltinFormatterFunction):
def evaluate(self, formatter, kwargs, mi, locals, fmt):
fmt_data = mi.get('format_metadata', {})
data = sorted(fmt_data.items(), key=lambda x:x[1]['mtime'], reverse=True)
return ','.join(k.upper()+':'+format_date(v['mtime'], fmt)
try:
data = sorted(fmt_data.items(), key=lambda x:x[1]['mtime'], reverse=True)
return ','.join(k.upper()+':'+format_date(v['mtime'], fmt)
for k,v in data)
except:
return ''
class BuiltinFormatsSizes(BuiltinFormatterFunction):
@ -810,7 +813,10 @@ class BuiltinFormatsSizes(BuiltinFormatterFunction):
def evaluate(self, formatter, kwargs, mi, locals):
fmt_data = mi.get('format_metadata', {})
return ','.join(k.upper()+':'+str(v['size']) for k,v in fmt_data.iteritems())
try:
return ','.join(k.upper()+':'+str(v['size']) for k,v in fmt_data.iteritems())
except:
return ''
class BuiltinFormatsPaths(BuiltinFormatterFunction):
@ -826,7 +832,10 @@ class BuiltinFormatsPaths(BuiltinFormatterFunction):
def evaluate(self, formatter, kwargs, mi, locals):
fmt_data = mi.get('format_metadata', {})
return ','.join(k.upper()+':'+str(v['path']) for k,v in fmt_data.iteritems())
try:
return ','.join(k.upper()+':'+str(v['path']) for k,v in fmt_data.iteritems())
except:
return ''
class BuiltinHumanReadable(BuiltinFormatterFunction):