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

Rationalize how smart_update knows what to do. Introduced 2 more metadata groups. One is the list of attributes that smart_update is to process specially. The other is the list of attributes that are to be copied if not none (what you called SPECIAL_FIELDS). These two help keep the replace and merge branches in sync.

Browse Source
This commit is contained in:
Charles Haley 2010-09-13 08:18:09 +01:00
parent e274719992
commit 43adf4226a
2 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -101,16 +101,23 @@ STANDARD_METADATA_FIELDS = SOCIAL_METADATA_FIELDS.union(
DEVICE_METADATA_FIELDS).union( DEVICE_METADATA_FIELDS).union(
CALIBRE_METADATA_FIELDS) CALIBRE_METADATA_FIELDS)
# Metadata fields that smart update must do special processing to copy.
SC_FIELDS_NOT_COPIED = frozenset(['title', 'title_sort', 'authors',
'author_sort', 'author_sort_map',
'cover_data', 'tags', 'language'])
# Metadata fields that smart update should copy only if the source is not None
SC_FIELDS_COPY_NOT_NULL = frozenset(['lpath', 'size', 'comments', 'thumbnail'])
# Metadata fields that smart update should copy without special handling # Metadata fields that smart update should copy without special handling
COPYABLE_METADATA_FIELDS = SOCIAL_METADATA_FIELDS.union( SC_COPYABLE_FIELDS = SOCIAL_METADATA_FIELDS.union(
PUBLICATION_METADATA_FIELDS).union( PUBLICATION_METADATA_FIELDS).union(
BOOK_STRUCTURE_FIELDS).union( BOOK_STRUCTURE_FIELDS).union(
DEVICE_METADATA_FIELDS).union( DEVICE_METADATA_FIELDS).union(
CALIBRE_METADATA_FIELDS) - \ CALIBRE_METADATA_FIELDS) - \
frozenset(['title', 'title_sort', 'authors', SC_FIELDS_NOT_COPIED.union(
'author_sort', 'author_sort_map' 'comments', SC_FIELDS_COPY_NOT_NULL)
'cover_data', 'tags', 'language', 'lpath',
'size', 'thumbnail'])
SERIALIZABLE_FIELDS = SOCIAL_METADATA_FIELDS.union( SERIALIZABLE_FIELDS = SOCIAL_METADATA_FIELDS.union(
USER_METADATA_FIELDS).union( USER_METADATA_FIELDS).union(

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

@ -9,7 +9,8 @@ import copy
import traceback import traceback
from calibre import prints from calibre import prints
from calibre.ebooks.metadata.book import COPYABLE_METADATA_FIELDS from calibre.ebooks.metadata.book import SC_COPYABLE_FIELDS
from calibre.ebooks.metadata.book import SC_FIELDS_COPY_NOT_NULL
from calibre.ebooks.metadata.book import STANDARD_METADATA_FIELDS from calibre.ebooks.metadata.book import STANDARD_METADATA_FIELDS
from calibre.ebooks.metadata.book import TOP_LEVEL_CLASSIFIERS from calibre.ebooks.metadata.book import TOP_LEVEL_CLASSIFIERS
from calibre.utils.date import isoformat, format_date from calibre.utils.date import isoformat, format_date
@ -223,22 +224,23 @@ class Metadata(object):
self.author_sort = other.author_sort self.author_sort = other.author_sort
if replace_metadata: if replace_metadata:
SPECIAL_FIELDS = frozenset(['lpath', 'size', 'comments', 'thumbnail']) # SPECIAL_FIELDS = frozenset(['lpath', 'size', 'comments', 'thumbnail'])
for attr in COPYABLE_METADATA_FIELDS: for attr in SC_COPYABLE_FIELDS:
setattr(self, attr, getattr(other, attr, 1.0 if \ setattr(self, attr, getattr(other, attr, 1.0 if \
attr == 'series_index' else None)) attr == 'series_index' else None))
self.tags = other.tags self.tags = other.tags
self.cover_data = getattr(other, 'cover_data', self.cover_data = getattr(other, 'cover_data',
NULL_VALUES['cover_data']) NULL_VALUES['cover_data'])
self.set_all_user_metadata(other.get_all_user_metadata(make_copy=True)) self.set_all_user_metadata(other.get_all_user_metadata(make_copy=True))
for x in SPECIAL_FIELDS: for x in SC_FIELDS_COPY_NOT_NULL:
copy_not_none(self, other, x) copy_not_none(self, other, x)
# language is handled below # language is handled below
else: else:
for attr in COPYABLE_METADATA_FIELDS: for attr in SC_COPYABLE_FIELDS:
if hasattr(other, attr):
copy_not_none(self, other, attr) copy_not_none(self, other, attr)
copy_not_none(self, other, 'thumbnail') for x in SC_FIELDS_COPY_NOT_NULL:
copy_not_none(self, other, x)
if other.tags: if other.tags:
# Case-insensitive but case preserving merging # Case-insensitive but case preserving merging
lotags = [t.lower() for t in other.tags] lotags = [t.lower() for t in other.tags]
@ -249,6 +251,7 @@ class Metadata(object):
oidx = lotags.index(t) oidx = lotags.index(t)
self.tags[sidx] = other.tags[oidx] self.tags[sidx] = other.tags[oidx]
self.tags += [t for t in other.tags if t.lower() in ot-st] self.tags += [t for t in other.tags if t.lower() in ot-st]
if getattr(other, 'cover_data', False): if getattr(other, 'cover_data', False):
other_cover = other.cover_data[-1] other_cover = other.cover_data[-1]
self_cover = self.cover_data[-1] if self.cover_data else '' self_cover = self.cover_data[-1] if self.cover_data else ''
@ -256,6 +259,7 @@ class Metadata(object):
if not other_cover: other_cover = '' if not other_cover: other_cover = ''
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, 'user_metadata_keys', None):
for x in other.user_metadata_keys: for x in other.user_metadata_keys:
meta = other.get_user_metadata(x, make_copy=True) meta = other.get_user_metadata(x, make_copy=True)
@ -274,6 +278,7 @@ class Metadata(object):
self_tags[sidx] = other.tags[oidx] self_tags[sidx] = other.tags[oidx]
self_tags += [t for t in other.tags if t.lower() in ot-st] self_tags += [t for t in other.tags if t.lower() in ot-st]
setattr(self, x, self_tags) setattr(self, x, self_tags)
my_comments = getattr(self, 'comments', '') my_comments = getattr(self, 'comments', '')
other_comments = getattr(other, 'comments', '') other_comments = getattr(other, 'comments', '')
if not my_comments: if not my_comments: