Fix several ondevice display problems, such as news overwriting books with the flag not changing. Also repair/add some explanatory comments.

src/calibre/gui2/device.py

@@ -791,12 +791,13 @@ class DeviceMixin(object): # {{{
                     self.booklists())
             model.paths_deleted(paths)
             self.upload_booklists()
-        # Clear the ondevice info so it will be recomputed
+        # Force recomputation the library's ondevice info. We don't need to call
+        # set_books_in_library, because no books were added to the device and
+        # the deleted book is no longer displayed.
         self.book_on_device(None, None, reset=True)
-        # We want to reset all the ondevice flags in the library. Use a big
+        # We need to reset the ondevice flags in the library. Use a big hammer,
-        # hammer, so we don't need to worry about whether some succeeded or not
+        # so we don't need to worry about whether some succeeded or not.
-        self.library_view.model().refresh()
+        self.refresh_ondevice_info(device_connected=True, reset_only=False)
-
 
     def dispatch_sync_event(self, dest, delete, specific):
         rows = self.library_view.selectionModel().selectedRows()
@@ -1286,8 +1287,14 @@ class DeviceMixin(object): # {{{
             books_to_be_deleted = memory[1]
             self.library_view.model().delete_books_by_id(books_to_be_deleted)
 
-        self.set_books_in_library(self.booklists(),
+        # There are some cases where sending a book to the device overwrites a
-                reset=bool(books_to_be_deleted))
+        # book already there with a different book. This happens frequently in
+        # news. When this happens, the book match indication will be wrong
+        # because the UUID changed. Force both the device and the library view
+        # to refresh the flags.
+        self.set_books_in_library(self.booklists(), reset=True)
+        self.book_on_device(None, reset=True)
+        self.refresh_ondevice_info(device_connected = True)
 
         view = self.card_a_view if on_card == 'carda' else self.card_b_view if on_card == 'cardb' else self.memory_view
         view.model().resort(reset=False)
@@ -1295,16 +1302,6 @@ class DeviceMixin(object): # {{{
         for f in files:
             getattr(f, 'close', lambda : True)()
 
-        self.book_on_device(None, reset=True)
-        if metadata:
-            changed = set([])
-            for mi in metadata:
-                id_ = getattr(mi, 'application_id', None)
-                if id_ is not None:
-                    changed.add(id_)
-            if changed:
-                self.library_view.model().refresh_ids(list(changed))
-
     def book_on_device(self, id, format=None, reset=False):
         '''
         Return an indication of whether the given book represented by its db id
@@ -1396,7 +1393,7 @@ class DeviceMixin(object): # {{{
                     # We really shouldn't get here, because set_books_in_library
                     # should have set the db_ids for the books, and therefore
                     # the if just above should have found them. Mark the book
-                    # anyway, and print a message about the situation
+                    # anyway, just in case.
                     loc[i] = True
                     loc[4] = 'metadata'
                     loc[5] = cache['paths']
@@ -1434,6 +1431,10 @@ class DeviceMixin(object): # {{{
                 if title not in self.db_book_title_cache:
                     self.db_book_title_cache[title] = \
                                 {'authors':{}, 'author_sort':{}, 'db_ids':{}}
+                # If there are multiple books in the library with the same title
+                # and author, then remember the last one. That is OK, because as
+                # we can't tell the difference between the books, one is as good
+                # as another.
                 if mi.authors:
                     authors = clean_string(authors_to_string(mi.authors))
                     self.db_book_title_cache[title]['authors'][authors] = mi
@@ -1446,10 +1447,9 @@ class DeviceMixin(object): # {{{
         # Now iterate through all the books on the device, setting the
         # in_library field. Fastest and most accurate key is the uuid. Second is
         # the application_id, which is really the db key, but as this can
-        # accidentally match across libraries we also verify the title. The
+        # accidentally match across libraries we also verify the title. Fallback
-        # db_id exists on Sony devices. Fallback is title and author match.
+        # is title and author match. We set the application ID so that we can
-        # We set the application ID so that we can reproduce book matching,
+        # reproduce book matching, necessary for identifying copies of books.
-        # necessary for identifying copies of books.
 
         update_metadata = prefs['manage_device_metadata'] == 'on_connect'
         for booklist in booklists:
@@ -1470,7 +1470,7 @@ class DeviceMixin(object): # {{{
                 if d is not None:
                     if getattr(book, 'application_id', None) in d['db_ids']:
                         book.in_library = True
-                        # application already matches db_id, so no need to set it
+                        # application already matches a db_id. No need to set it
                         if update_metadata:
                             book.smart_update(d['db_ids'][book.application_id],
                                               replace_metadata=True)

src/calibre/gui2/library/models.py

@@ -121,10 +121,10 @@ class BooksModel(QAbstractTableModel): # {{{
     def set_device_connected(self, is_connected):
         self.device_connected = is_connected
         self.db.refresh_ondevice()
+        self.refresh()
         if is_connected and self.sorted_on[0] == 'ondevice':
             self.resort()
 
-
     def set_book_on_device_func(self, func):
         self.book_on_device = func