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

Remove redundant code in format_field_extended

Browse Source
This commit is contained in:
Charles Haley 2012-04-28 14:37:06 +02:00
parent ee82fdac05
commit 6e61999cc4
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -647,14 +647,10 @@ class Metadata(object):
return (unicode(cmeta['name']+'_index'), '', '', cmeta) return (unicode(cmeta['name']+'_index'), '', '', cmeta)
if key in self.custom_field_keys(): if key in self.custom_field_keys():
res = self.get(key, None) res = self.get(key, None) # get evaluates all necessary composites
cmeta = self.get_user_metadata(key, make_copy=False) cmeta = self.get_user_metadata(key, make_copy=False)
name = unicode(cmeta['name']) name = unicode(cmeta['name'])
if cmeta['datatype'] != 'composite' and (res is None or res == ''): if res is None or res == '': # can't check "not res" because of numeric fields
return (name, res, None, None)
orig_res = res
cmeta = self.get_user_metadata(key, make_copy=False)
if res is None or res == '':
return (name, res, None, None) return (name, res, None, None)
orig_res = res orig_res = res
datatype = cmeta['datatype'] datatype = cmeta['datatype']