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

Fix bugs in scanning.

Browse Source
This commit is contained in:
Charles Haley 2012-09-12 19:32:41 +02:00
parent f51127110b
commit 383d48ef20
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -523,7 +523,7 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
def _set_known_metadata(self, book, remove=False): def _set_known_metadata(self, book, remove=False):
lpath = book.lpath lpath = book.lpath
if remove: if remove:
self.known_metadata[lpath] = None self.known_metadata.pop(lpath, None)
else: else:
self.known_metadata[lpath] = book.deepcopy() self.known_metadata[lpath] = book.deepcopy()
@ -844,10 +844,11 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
for book in bl: for book in bl:
if book.get('_new_book_', None): if book.get('_new_book_', None):
total += 1 total += 1
count = 0; count = 0
for book in bl: for book in bl:
if book.get('_new_book_', None): if book.get('_new_book_', None):
paths = [book.lpath] paths = [book.lpath]
self._set_known_metadata(book, remove=True)
self.prepare_addable_books(paths, this_book=count, total_books=total) self.prepare_addable_books(paths, this_book=count, total_books=total)
book.smart_update(self._read_file_metadata(paths[0])) book.smart_update(self._read_file_metadata(paths[0]))
del book._new_book_ del book._new_book_
@ -992,7 +993,7 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
'canStream':True}, 'canStream':True},
print_debug_info=False) print_debug_info=False)
if opcode == 'OK': if opcode == 'OK':
client_will_stream = 'willStream' in result; client_will_stream = 'willStream' in result
while not eof: while not eof:
if not result['eof']: if not result['eof']:
data = b64decode(result['data']) data = b64decode(result['data'])