From 383d48ef206bfaabbea533fe6ff6770b5e0536fc Mon Sep 17 00:00:00 2001
From: Charles Haley <>
Date: Wed, 12 Sep 2012 19:32:41 +0200
Subject: [PATCH] Fix bugs in scanning.

---
 src/calibre/devices/smart_device_app/driver.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

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