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 from trunk

Browse Source
This commit is contained in:
Charles Haley 2012-03-15 09:05:13 +01:00
commit b635e15e58
3 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/calibre/ebooks/metadata/book/__init__.py
View File

@ -131,8 +131,3 @@ SERIALIZABLE_FIELDS = SOCIAL_METADATA_FIELDS.union(
frozenset(['device_collections', 'formats', frozenset(['device_collections', 'formats',
'cover_data']) 'cover_data'])
# these are rebuilt when needed # these are rebuilt when needed
# A special set used to optimize the performance of Metadata.__setattr__
ATTR_NORMAL_FIELDS = frozenset(STANDARD_METADATA_FIELDS -
TOP_LEVEL_IDENTIFIERS -
set('identifiers'))

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

@ -9,17 +9,19 @@ import copy, traceback
from calibre import prints from calibre import prints
from calibre.constants import DEBUG from calibre.constants import DEBUG
from calibre.ebooks.metadata.book import SC_COPYABLE_FIELDS from calibre.ebooks.metadata.book import (SC_COPYABLE_FIELDS,
from calibre.ebooks.metadata.book import SC_FIELDS_COPY_NOT_NULL SC_FIELDS_COPY_NOT_NULL, STANDARD_METADATA_FIELDS,
from calibre.ebooks.metadata.book import STANDARD_METADATA_FIELDS TOP_LEVEL_IDENTIFIERS, ALL_METADATA_FIELDS)
from calibre.ebooks.metadata.book import TOP_LEVEL_IDENTIFIERS
from calibre.ebooks.metadata.book import ALL_METADATA_FIELDS
from calibre.ebooks.metadata.book import ATTR_NORMAL_FIELDS
from calibre.library.field_metadata import FieldMetadata from calibre.library.field_metadata import FieldMetadata
from calibre.utils.date import isoformat, format_date from calibre.utils.date import isoformat, format_date
from calibre.utils.icu import sort_key from calibre.utils.icu import sort_key
from calibre.utils.formatter import TemplateFormatter from calibre.utils.formatter import TemplateFormatter
# Special sets used to optimize the performance of getting and setting
# attributes on Metadata objects
SIMPLE_GET = frozenset(STANDARD_METADATA_FIELDS - TOP_LEVEL_IDENTIFIERS)
SIMPLE_SET = frozenset(SIMPLE_GET - {'identifiers'})
def human_readable(size, precision=2): def human_readable(size, precision=2):
""" Convert a size in bytes into megabytes """ """ Convert a size in bytes into megabytes """
return ('%.'+str(precision)+'f'+ 'MB') % ((size/(1024.*1024.)),) return ('%.'+str(precision)+'f'+ 'MB') % ((size/(1024.*1024.)),)
@ -137,7 +139,7 @@ class Metadata(object):
def __getattribute__(self, field): def __getattribute__(self, field):
_data = object.__getattribute__(self, '_data') _data = object.__getattribute__(self, '_data')
if field in ATTR_NORMAL_FIELDS: if field in SIMPLE_GET:
return _data.get(field, None) return _data.get(field, None)
if field in TOP_LEVEL_IDENTIFIERS: if field in TOP_LEVEL_IDENTIFIERS:
return _data.get('identifiers').get(field, None) return _data.get('identifiers').get(field, None)
@ -174,7 +176,7 @@ class Metadata(object):
def __setattr__(self, field, val, extra=None): def __setattr__(self, field, val, extra=None):
_data = object.__getattribute__(self, '_data') _data = object.__getattribute__(self, '_data')
if field in ATTR_NORMAL_FIELDS: if field in SIMPLE_SET:
if val is None: if val is None:
val = copy.copy(NULL_VALUES.get(field, None)) val = copy.copy(NULL_VALUES.get(field, None))
_data[field] = val _data[field] = val

24
src/calibre/library/database2.py
View File

@ -911,7 +911,14 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
Note that the list of formats is not verified. Note that the list of formats is not verified.
''' '''
idx = idx if index_is_id else self.id(idx) idx = idx if index_is_id else self.id(idx)
row = self.data._data[idx] try:
row = self.data._data[idx]
except:
row = None
if row is None:
raise ValueError('No book with id: %d'%idx)
fm = self.FIELD_MAP fm = self.FIELD_MAP
mi = Metadata(None, template_cache=self.formatter_template_cache) mi = Metadata(None, template_cache=self.formatter_template_cache)
@ -949,14 +956,13 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
mi.book_size = row[fm['size']] mi.book_size = row[fm['size']]
mi.ondevice_col= row[fm['ondevice']] mi.ondevice_col= row[fm['ondevice']]
mi.last_modified = row[fm['last_modified']] mi.last_modified = row[fm['last_modified']]
id = idx
formats = row[fm['formats']] formats = row[fm['formats']]
mi.format_metadata = {} mi.format_metadata = {}
if not formats: if not formats:
good_formats = None good_formats = None
else: else:
formats = sorted(formats.split(',')) formats = sorted(formats.split(','))
mi.format_metadata = FormatMetadata(self, id, formats) mi.format_metadata = FormatMetadata(self, idx, formats)
good_formats = FormatsList(formats, mi.format_metadata) good_formats = FormatsList(formats, mi.format_metadata)
mi.formats = good_formats mi.formats = good_formats
tags = row[fm['tags']] tags = row[fm['tags']]
@ -969,9 +975,9 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
if mi.series: if mi.series:
mi.series_index = row[fm['series_index']] mi.series_index = row[fm['series_index']]
mi.rating = row[fm['rating']] mi.rating = row[fm['rating']]
mi.set_identifiers(self.get_identifiers(id, index_is_id=True)) mi.set_identifiers(self.get_identifiers(idx, index_is_id=True))
mi.application_id = id mi.application_id = idx
mi.id = id mi.id = idx
mi.set_all_user_metadata(self.field_metadata.custom_field_metadata()) mi.set_all_user_metadata(self.field_metadata.custom_field_metadata())
for key, meta in self.field_metadata.custom_iteritems(): for key, meta in self.field_metadata.custom_iteritems():
@ -999,12 +1005,12 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
if get_cover: if get_cover:
if cover_as_data: if cover_as_data:
cdata = self.cover(id, index_is_id=True) cdata = self.cover(idx, index_is_id=True)
if cdata: if cdata:
mi.cover_data = ('jpeg', cdata) mi.cover_data = ('jpeg', cdata)
else: else:
mi.cover = self.cover(id, index_is_id=True, as_path=True) mi.cover = self.cover(idx, index_is_id=True, as_path=True)
mi.has_cover = _('Yes') if self.has_cover(id) else '' mi.has_cover = _('Yes') if self.has_cover(idx) else ''
return mi return mi
def has_book(self, mi): def has_book(self, mi):