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

PRS-505/700: Fix empty collections bug.

Browse Source
This commit is contained in:
John Schember 2009-06-20 16:23:21 -04:00
parent b64b78d84b
commit 3d75ec49c4
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/calibre/devices/prs505/driver.py
View File

@ -180,16 +180,25 @@ class PRS505(CLI, Device):
return zip(paths, sizes, ctimes, cycle([on_card])) return zip(paths, sizes, ctimes, cycle([on_card]))
@classmethod def add_books_to_metadata(self, locations, metadata, booklists):
def add_books_to_metadata(cls, locations, metadata, booklists):
metadata = iter(metadata) metadata = iter(metadata)
for location in locations: for location in locations:
info = metadata.next() info = metadata.next()
path = location[0] path = location[0]
blist = 2 if location[3] == 'cardb' else 1 if location[3] == 'carda' else 0 blist = 2 if location[3] == 'cardb' else 1 if location[3] == 'carda' else 0
name = path.rpartition(os.sep)[2]
name = (cls.CARD_PATH_PREFIX+'/' if blist else 'database/media/books/') + name if path.startswith(self._main_prefix):
name = path.replace(self._main_prefix, '')
elif path.startswith(self._card_a_prefix):
name = path.replace(self._card_a_prefix, '')
elif path.startswith(self._card_b_prefix):
name = path.replace(self._card_b_prefix, '')
name = name.replace('\\', '/')
name = name.replace('//', '/') name = name.replace('//', '/')
if name.startswith('/'):
name = name[1:]
booklists[blist].add_book(info, name, *location[1:-1]) booklists[blist].add_book(info, name, *location[1:-1])
fix_ids(*booklists) fix_ids(*booklists)