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

Fix stupid mistake in method naming in base.py

Browse Source
This commit is contained in:
Charles Haley 2010-09-26 17:49:52 +01:00
parent 1cd78a56f2
commit a05448f784
2 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -181,17 +181,10 @@ class Metadata(object):
''' '''
return metadata describing a standard or custom field. return metadata describing a standard or custom field.
''' '''
if key in self.user_metadata_keys(): if key not in self.custom_field_keys():
return self.get_standard_metadata(self, key, make_copy=False) return self.get_standard_metadata(self, key, make_copy=False)
return self.get_user_metadata(key, make_copy=False) return self.get_user_metadata(key, make_copy=False)
def user_metadata_keys(self):
'''
Return the standard keys actually in this book.
'''
_data = object.__getattribute__(self, '_data')
return frozenset(_data['user_metadata'].iterkeys())
def all_non_none_fields(self): def all_non_none_fields(self):
''' '''
Return a dictionary containing all non-None metadata fields, including Return a dictionary containing all non-None metadata fields, including
@ -305,7 +298,7 @@ class Metadata(object):
def print_all_attributes(self): def print_all_attributes(self):
for x in STANDARD_METADATA_FIELDS: for x in STANDARD_METADATA_FIELDS:
prints('%s:'%x, getattr(self, x, 'None')) prints('%s:'%x, getattr(self, x, 'None'))
for x in self.user_metadata_keys(): for x in self.custom_field_keys():
meta = self.get_user_metadata(x, make_copy=False) meta = self.get_user_metadata(x, make_copy=False)
if meta is not None: if meta is not None:
prints(x, meta) prints(x, meta)
@ -370,8 +363,8 @@ class Metadata(object):
if len(other_cover) > len(self_cover): if len(other_cover) > len(self_cover):
self.cover_data = other.cover_data self.cover_data = other.cover_data
if getattr(other, 'user_metadata_keys', None): if getattr(other, 'custom_field_keys', None):
for x in other.user_metadata_keys(): for x in other.custom_field_keys():
meta = other.get_user_metadata(x, make_copy=True) meta = other.get_user_metadata(x, make_copy=True)
if meta is not None: if meta is not None:
self_tags = self.get(x, []) self_tags = self.get(x, [])
@ -434,7 +427,7 @@ class Metadata(object):
''' '''
returns the tuple (field_name, formatted_value) returns the tuple (field_name, formatted_value)
''' '''
if key in self.user_metadata_keys(): if key in self.custom_field_keys():
res = self.get(key, None) res = self.get(key, None)
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'])
@ -516,7 +509,7 @@ class Metadata(object):
fmt('Published', isoformat(self.pubdate)) fmt('Published', isoformat(self.pubdate))
if self.rights is not None: if self.rights is not None:
fmt('Rights', unicode(self.rights)) fmt('Rights', unicode(self.rights))
for key in self.user_metadata_keys(): for key in self.custom_field_keys():
val = self.get(key, None) val = self.get(key, None)
if val: if val:
(name, val) = self.format_field(key) (name, val) = self.format_field(key)
@ -541,7 +534,7 @@ class Metadata(object):
ans += [(_('Published'), unicode(self.pubdate.isoformat(' ')))] ans += [(_('Published'), unicode(self.pubdate.isoformat(' ')))]
if self.rights is not None: if self.rights is not None:
ans += [(_('Rights'), unicode(self.rights))] ans += [(_('Rights'), unicode(self.rights))]
for key in self.user_metadata_keys(): for key in self.custom_field_keys():
val = self.get(key, None) val = self.get(key, None)
if val: if val:
(name, val) = self.format_field(key) (name, val) = self.format_field(key)

2
src/calibre/gui2/library/models.py
View File

@ -331,7 +331,7 @@ class BooksModel(QAbstractTableModel): # {{{
_('Book <font face="serif">%s</font> of %s.')%\ _('Book <font face="serif">%s</font> of %s.')%\
(sidx, prepare_string_for_xml(series)) (sidx, prepare_string_for_xml(series))
mi = self.db.get_metadata(idx) mi = self.db.get_metadata(idx)
for key in mi.user_metadata_keys(): for key in mi.custom_field_keys():
name, val = mi.format_field(key) name, val = mi.format_field(key)
if val: if val:
data[name] = val data[name] = val