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

Finish using booklist api correctly

Browse Source
This commit is contained in:
Charles Haley 2010-05-17 23:55:56 +01:00
parent 6f504a1009
commit 83c75cd864
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/calibre/devices/usbms/driver.py
View File

@ -82,13 +82,15 @@ class USBMS(CLI, Device):
lpath = os.path.join(path, filename).partition(self.normalize_path(prefix))[2] lpath = os.path.join(path, filename).partition(self.normalize_path(prefix))[2]
if lpath.startswith(os.sep): if lpath.startswith(os.sep):
lpath = lpath[len(os.sep):] lpath = lpath[len(os.sep):]
idx = bl_cache.get(lpath.replace('\\', '/'), None) lpath = lpath.replace('\\', '/')
idx = bl_cache.get(lpath, None)
if idx is not None: if idx is not None:
if self.update_metadata_item(bl[idx]): if self.update_metadata_item(bl[idx]):
#print 'update_metadata_item returned true' #print 'update_metadata_item returned true'
changed = True changed = True
bl_cache[lpath.replace('\\', '/')] = None bl_cache[lpath] = None
else: else:
#print "adding new book", lpath
if bl.add_book(self.book_from_path(prefix, lpath), if bl.add_book(self.book_from_path(prefix, lpath),
replace_metadata=False): replace_metadata=False):
changed = True changed = True
@ -125,10 +127,13 @@ class USBMS(CLI, Device):
if changed: if changed:
need_sync = True need_sync = True
for val in bl_cache.itervalues(): # Remove books that are no longer in the filesystem. Cache contains
if val is not None: # indices into the booklist if book not in filesystem, None otherwise
# Do the operation in reverse order so indices remain valid
for idx in bl_cache.itervalues().reversed():
if idx is not None:
need_sync = True need_sync = True
del bl[val] del bl[idx]
#print "count found in cache: %d, count of files in metadata: %d, need_sync: %s" % \ #print "count found in cache: %d, count of files in metadata: %d, need_sync: %s" % \
# (len(bl_cache), len(bl), need_sync) # (len(bl_cache), len(bl), need_sync)