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-09-09 17:49:08 +05:30
commit 16e8366e1a
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1246,6 +1246,8 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
opcode, result = self._receive_from_client(print_debug_info=False) opcode, result = self._receive_from_client(print_debug_info=False)
books_on_device.append(result) books_on_device.append(result)
self._debug('received all books. count=', count)
books_to_send = [] books_to_send = []
lpaths_on_device = set() lpaths_on_device = set()
for r in books_on_device: for r in books_on_device:
@ -1258,7 +1260,8 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
if book: if book:
if self.client_cache_uses_lpaths: if self.client_cache_uses_lpaths:
lpaths_on_device.add(r.get('lpath')) lpaths_on_device.add(r.get('lpath'))
bl.add_book(book, replace_metadata=True) bl.add_book_extended(book, replace_metadata=True,
check_for_duplicates=not self.client_cache_uses_lpaths)
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))
book.set('_last_read_date_', r.get('_last_read_date_', None)) book.set('_last_read_date_', r.get('_last_read_date_', None))
@ -1266,9 +1269,10 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
else: else:
books_to_send.append(r['priKey']) books_to_send.append(r['priKey'])
self._debug('processed cache. count=', len(books_on_device))
count_of_cache_items_deleted = 0 count_of_cache_items_deleted = 0
if self.client_cache_uses_lpaths: if self.client_cache_uses_lpaths:
for lpath in self.known_metadata.keys(): for lpath in self.known_metadata.iterkeys():
if lpath not in lpaths_on_device: if lpath not in lpaths_on_device:
try: try:
uuid = self.known_metadata[lpath].get('uuid', None) uuid = self.known_metadata[lpath].get('uuid', None)
@ -1299,10 +1303,12 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
if '_series_sort_' in result: if '_series_sort_' in result:
del result['_series_sort_'] del result['_series_sort_']
book = self.json_codec.raw_to_book(result, SDBook, self.PREFIX) book = self.json_codec.raw_to_book(result, SDBook, self.PREFIX)
self._debug('title', book.title)
book.set('_is_read_', result.get('_is_read_', None)) book.set('_is_read_', result.get('_is_read_', None))
book.set('_sync_type_', result.get('_sync_type_', None)) book.set('_sync_type_', result.get('_sync_type_', None))
book.set('_last_read_date_', result.get('_last_read_date_', None)) book.set('_last_read_date_', result.get('_last_read_date_', None))
bl.add_book(book, replace_metadata=True) bl.add_book_extended(book, replace_metadata=True,
check_for_duplicates=not self.client_cache_uses_lpaths)
if '_new_book_' in result: if '_new_book_' in result:
book.set('_new_book_', True) book.set('_new_book_', True)
else: else:

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

@ -73,12 +73,15 @@ class BookList(_BookList):
return False return False
def add_book(self, book, replace_metadata): def add_book(self, book, replace_metadata):
self.add_book_extended(book, replace_metadata, check_for_duplicates=True)
def add_book_extended(self, book, replace_metadata, check_for_duplicates):
''' '''
Add the book to the booklist, if needed. Return None if the book is Add the book to the booklist, if needed. Return None if the book is
already there and not updated, otherwise return the book. already there and not updated, otherwise return the book.
''' '''
try: try:
b = self.index(book) b = self.index(book) if check_for_duplicates else None
except (ValueError, IndexError): except (ValueError, IndexError):
b = None b = None
if b is None: if b is None: