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

Fix a bug and a regression in sony collection series ordering

Browse Source
This commit is contained in:
Charles Haley 2010-07-02 21:37:47 +01:00
parent 62c9c54f1f
commit 430ff00edb
2 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/calibre/devices/prs505/sony_cache.py
View File

@ -388,23 +388,35 @@ class XMLCache(object):
debug_print('WARNING: Some elements in the JSON cache were not'
' found in the XML cache')
records = [x for x in records if x is not None]
ids = set()
# Ensure each book has an ID.
for rec in records:
id = rec.get('id', None)
if id is None:
if rec.get('id', None) is None:
rec.set('id', str(self.max_id(root)+1))
id = rec.get('id', None)
ids.add(id)
# ids cannot contain None, so no reason to check
ids = [x.get('id', None) for x in records]
# Given that we set the ids, there shouldn't be any None's. But
# better to be safe...
if None in ids:
debug_print('WARNING: Some <text> elements do not have ids')
ids = [x for x in ids if x is not None]
playlist = self.get_or_create_playlist(bl_index, category)
# Reduce ids to books not already in the playlist
# Get the books currently in the playlist. We will need them to be
# sure to put back any books that were manually added.
playlist_ids = []
for item in playlist:
id_ = item.get('id', None)
if id_ is not None:
ids.discard(id_)
# Add the books in ids that were not already in the playlist
for id_ in ids:
playlist_ids.append(id_)
# Empty the playlist. We do this so that the playlist will have the
# order specified by get_collections
for item in list(playlist):
playlist.remove(item)
# Get a list of ids not known by get_collections
extra_ids = [x for x in playlist_ids if x not in ids]
# Rebuild the collection in the order specified by get_collections. Then
# add the ids that get_collections didn't know about.
for id_ in ids + extra_ids:
item = playlist.makeelement(
'{%s}item'%self.namespaces[bl_index],
nsmap=playlist.nsmap, attrib={'id':id_})

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

@ -174,8 +174,8 @@ class CollectionsBookList(BookList):
if lpath not in collections_lpaths[category]:
collections_lpaths[category].add(lpath)
collections[category].append(book)
if attr == 'series':
series_categories.add(category)
if attr == 'series':
series_categories.add(category)
# Sort collections
for category, books in collections.items():
def tgetter(x):