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 branch 'master' of https://github.com/cbhaley/calibre

Browse Source
This commit is contained in:
Kovid Goyal 2014-03-18 14:29:16 +05:30
commit 0e36f48c19
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/calibre/devices/smart_device_app/driver.py
View File

@ -226,7 +226,7 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
PURGE_CACHE_ENTRIES_DAYS = 30 PURGE_CACHE_ENTRIES_DAYS = 30
CURRENT_CC_VERSION = 64 CURRENT_CC_VERSION = 73
ZEROCONF_CLIENT_STRING = b'calibre wireless device client' ZEROCONF_CLIENT_STRING = b'calibre wireless device client'
@ -1223,6 +1223,7 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
books_on_device.append(result) books_on_device.append(result)
books_to_send = [] books_to_send = []
lpaths_on_device = set()
for r in books_on_device: for r in books_on_device:
if r.get('lpath', None): if r.get('lpath', None):
book = self._metadata_in_cache(r['uuid'], r['lpath'], book = self._metadata_in_cache(r['uuid'], r['lpath'],
@ -1231,6 +1232,8 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
book = self._metadata_in_cache(r['uuid'], r['extension'], book = self._metadata_in_cache(r['uuid'], r['extension'],
r['last_modified']) r['last_modified'])
if book: if book:
if self.client_cache_uses_lpaths:
lpaths_on_device.add(r.get('lpath'))
bl.add_book(book, replace_metadata=True) bl.add_book(book, replace_metadata=True)
book.set('_is_read_', r.get('_is_read_', None)) book.set('_is_read_', r.get('_is_read_', None))
book.set('_sync_type_', r.get('_sync_type_', None)) book.set('_sync_type_', r.get('_sync_type_', None))
@ -1238,6 +1241,22 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
else: else:
books_to_send.append(r['priKey']) books_to_send.append(r['priKey'])
count_of_cache_items_deleted = 0
if self.client_cache_uses_lpaths:
for lpath in self.known_metadata.keys():
if lpath not in lpaths_on_device:
try:
uuid = self.known_metadata[lpath].get('uuid', None)
if uuid is not None:
key = self._make_metadata_cache_key(uuid, lpath)
self.device_book_cache.pop(key, None)
self.known_metadata.pop(lpath, None)
count_of_cache_items_deleted += 1
except:
self._debug('Exception while deleting book from caches', lpath)
traceback.print_exc()
self._debug('removed', count_of_cache_items_deleted, 'books from caches')
count = len(books_to_send) count = len(books_to_send)
self._debug('caching. Need count from device', count) self._debug('caching. Need count from device', count)