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 2010-09-12 21:13:35 +01:00
parent 9defefd7b2
commit 0a2f80fdbf
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/devices/usbms/books.py
View File

@ -59,7 +59,7 @@ class Book(Metadata):
return property(doc=doc, fget=fget) return property(doc=doc, fget=fget)
@dynamic_property @dynamic_property
def thumbnail(self): def thumbnail(self):'
return None return None
class BookList(_BookList): class BookList(_BookList):

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

@ -110,7 +110,7 @@ COPYABLE_METADATA_FIELDS = SOCIAL_METADATA_FIELDS.union(
frozenset(['title', 'title_sort', 'authors', frozenset(['title', 'title_sort', 'authors',
'author_sort', 'author_sort_map' 'comments', 'author_sort', 'author_sort_map' 'comments',
'cover_data', 'tags', 'language', 'lpath', 'cover_data', 'tags', 'language', 'lpath',
'size']) 'size', 'thumbnail'])
SERIALIZABLE_FIELDS = SOCIAL_METADATA_FIELDS.union( SERIALIZABLE_FIELDS = SOCIAL_METADATA_FIELDS.union(
USER_METADATA_FIELDS).union( USER_METADATA_FIELDS).union(

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

@ -243,7 +243,7 @@ class Metadata(object):
lotags = [t.lower() for t in other.tags] lotags = [t.lower() for t in other.tags]
lstags = [t.lower() for t in self.tags] lstags = [t.lower() for t in self.tags]
ot, st = map(frozenset, (lotags, lstags)) ot, st = map(frozenset, (lotags, lstags))
for t in st.interection(ot): for t in st.intersection(ot):
sidx = lstags.index(t) sidx = lstags.index(t)
oidx = lotags.index(t) oidx = lotags.index(t)
self.tags[sidx] = other.tags[oidx] self.tags[sidx] = other.tags[oidx]