Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-07 18:24:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix reading status problem with old Kobo firmware

Browse Source 
Recent changes in the handling of collections in the KoboTouch driver
broke how these were handled for the 1.9.x firmware. The change meant
the reading status of all books in the device was reset. The problem was
reported in http://www.mobileread.com/forums/showthread.php?t=278987.
This commit is contained in:
David 2016-10-19 22:43:49 +11:00
parent 0449f879f7
commit 73c420471d
1 changed files with 84 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

166
src/calibre/devices/kobo/driver.py
View File

@ -2248,94 +2248,96 @@ class KOBOTOUCH(KOBO):
with closing(self.device_database_connection()) as connection: with closing(self.device_database_connection()) as connection:
if self.manage_collections and collections: if self.manage_collections:
# debug_print("KoboTouch:update_device_database_collections - length collections=" + unicode(len(collections))) if collections:
# debug_print("KoboTouch:update_device_database_collections - length collections=" + unicode(len(collections)))
# Need to reset the collections outside the particular loops # Need to reset the collections outside the particular loops
# otherwise the last item will not be removed # otherwise the last item will not be removed
if self.dbversion < 53: if self.dbversion < 53:
debug_print("KoboTouch:update_device_database_collections - calling reset_readstatus") debug_print("KoboTouch:update_device_database_collections - calling reset_readstatus")
self.reset_readstatus(connection, oncard) self.reset_readstatus(connection, oncard)
if self.dbversion >= 14 and self.fwversion < self.min_fwversion_shelves: if self.dbversion >= 14 and self.fwversion < self.min_fwversion_shelves:
debug_print("KoboTouch:update_device_database_collections - calling reset_favouritesindex") debug_print("KoboTouch:update_device_database_collections - calling reset_favouritesindex")
self.reset_favouritesindex(connection, oncard) self.reset_favouritesindex(connection, oncard)
# debug_print("KoboTouch:update_device_database_collections - length collections=", len(collections)) # debug_print("KoboTouch:update_device_database_collections - length collections=", len(collections))
# debug_print("KoboTouch:update_device_database_collections - self.bookshelvelist=", self.bookshelvelist) # debug_print("KoboTouch:update_device_database_collections - self.bookshelvelist=", self.bookshelvelist)
# Process any collections that exist # Process any collections that exist
for category, books in collections.items(): for category, books in collections.items():
debug_print("KoboTouch:update_device_database_collections - category='%s' books=%d"%(category, len(books))) debug_print("KoboTouch:update_device_database_collections - category='%s' books=%d"%(category, len(books)))
if create_collections and not (category in supportedcategories or category in readstatuslist or category in accessibilitylist): if create_collections and not (category in supportedcategories or category in readstatuslist or category in accessibilitylist):
self.check_for_bookshelf(connection, category) self.check_for_bookshelf(connection, category)
# if category in self.bookshelvelist: # if category in self.bookshelvelist:
# debug_print("Category: ", category, " id = ", readstatuslist.get(category)) # debug_print("Category: ", category, " id = ", readstatuslist.get(category))
for book in books: for book in books:
# debug_print(' Title:', book.title, 'category: ', category) # debug_print(' Title:', book.title, 'category: ', category)
show_debug = self.is_debugging_title(book.title) show_debug = self.is_debugging_title(book.title)
if show_debug:
debug_print(' Title="%s"'%book.title, 'category="%s"'%category)
# debug_print(book)
debug_print(' class=%s'%book.__class__)
debug_print(' book.contentID="%s"'%book.contentID)
debug_print(' book.application_id="%s"'%book.application_id)
if book.application_id is None:
continue
category_added = False
if book.contentID is None:
debug_print(' Do not know ContentID - Title="%s"'%book.title)
extension = os.path.splitext(book.path)[1]
ContentType = self.get_content_type_from_extension(extension) if extension != '' else self.get_content_type_from_path(book.path)
book.contentID = self.contentid_from_path(book.path, ContentType)
if category in self.ignore_collections_names:
debug_print(' Ignoring collection=%s' % category)
category_added = True
elif category in self.bookshelvelist and self.supports_bookshelves:
if show_debug: if show_debug:
debug_print(' length book.device_collections=%d'%len(book.device_collections)) debug_print(' Title="%s"'%book.title, 'category="%s"'%category)
if category not in book.device_collections: # debug_print(book)
if show_debug: debug_print(' class=%s'%book.__class__)
debug_print(' Setting bookshelf on device') debug_print(' book.contentID="%s"'%book.contentID)
self.set_bookshelf(connection, book, category) debug_print(' book.application_id="%s"'%book.application_id)
if book.application_id is None:
continue
category_added = False
if book.contentID is None:
debug_print(' Do not know ContentID - Title="%s"'%book.title)
extension = os.path.splitext(book.path)[1]
ContentType = self.get_content_type_from_extension(extension) if extension != '' else self.get_content_type_from_path(book.path)
book.contentID = self.contentid_from_path(book.path, ContentType)
if category in self.ignore_collections_names:
debug_print(' Ignoring collection=%s' % category)
category_added = True category_added = True
elif category in readstatuslist.keys(): elif category in self.bookshelvelist and self.supports_bookshelves:
# Manage ReadStatus
self.set_readstatus(connection, book.contentID, readstatuslist.get(category))
category_added = True
elif category == 'Shortlist' and self.dbversion >= 14:
if show_debug:
debug_print(' Have an older version shortlist - %s'%book.title)
# Manage FavouritesIndex/Shortlist
if not self.supports_bookshelves:
if show_debug: if show_debug:
debug_print(' and about to set it - %s'%book.title) debug_print(' length book.device_collections=%d'%len(book.device_collections))
self.set_favouritesindex(connection, book.contentID) if category not in book.device_collections:
if show_debug:
debug_print(' Setting bookshelf on device')
self.set_bookshelf(connection, book, category)
category_added = True
elif category in readstatuslist.keys():
debug_print("KoboTouch:update_device_database_collections - about to set_readstatus - category='%s'"%(category, ))
# Manage ReadStatus
self.set_readstatus(connection, book.contentID, readstatuslist.get(category))
category_added = True category_added = True
elif category in accessibilitylist.keys():
# Do not manage the Accessibility List
pass
if category_added and category not in book.device_collections: elif category == 'Shortlist' and self.dbversion >= 14:
if show_debug: if show_debug:
debug_print(' adding category to book.device_collections', book.device_collections) debug_print(' Have an older version shortlist - %s'%book.title)
book.device_collections.append(category) # Manage FavouritesIndex/Shortlist
else: if not self.supports_bookshelves:
if show_debug: if show_debug:
debug_print(' category not added to book.device_collections', book.device_collections) debug_print(' and about to set it - %s'%book.title)
debug_print("KoboTouch:update_device_database_collections - end for category='%s'"%category) self.set_favouritesindex(connection, book.contentID)
category_added = True
elif category in accessibilitylist.keys():
# Do not manage the Accessibility List
pass
elif bookshelf_attribute: # No collections but have set the shelf option if category_added and category not in book.device_collections:
# Since no collections exist the ReadStatus needs to be reset to 0 (Unread) if show_debug:
debug_print("No Collections - reseting ReadStatus") debug_print(' adding category to book.device_collections', book.device_collections)
if self.dbversion < 53: book.device_collections.append(category)
self.reset_readstatus(connection, oncard) else:
if self.dbversion >= 14 and self.fwversion < self.min_fwversion_shelves: if show_debug:
debug_print("No Collections - resetting FavouritesIndex") debug_print(' category not added to book.device_collections', book.device_collections)
self.reset_favouritesindex(connection, oncard) debug_print("KoboTouch:update_device_database_collections - end for category='%s'"%category)
elif bookshelf_attribute: # No collections but have set the shelf option
# Since no collections exist the ReadStatus needs to be reset to 0 (Unread)
debug_print("No Collections - reseting ReadStatus")
if self.dbversion < 53:
self.reset_readstatus(connection, oncard)
if self.dbversion >= 14 and self.fwversion < self.min_fwversion_shelves:
debug_print("No Collections - resetting FavouritesIndex")
self.reset_favouritesindex(connection, oncard)
# Set the series info and cleanup the bookshelves only if the firmware supports them and the user has set the options. # Set the series info and cleanup the bookshelves only if the firmware supports them and the user has set the options.
if (self.supports_bookshelves and self.manage_collections or self.supports_series()) and (bookshelf_attribute or update_series_details): if (self.supports_bookshelves and self.manage_collections or self.supports_series()) and (bookshelf_attribute or update_series_details):
@ -2944,11 +2946,11 @@ class KOBOTOUCH(KOBO):
@property @property
def manage_collections(self): def manage_collections(self):
return self.get_pref('manage_collections') and self.supports_bookshelves return self.get_pref('manage_collections')
@property @property
def create_collections(self): def create_collections(self):
return self.manage_collections and self.get_pref('create_collections') and len(self.collections_columns) > 0 return self.manage_collections and self.supports_bookshelves and self.get_pref('create_collections') and len(self.collections_columns) > 0
@property @property
def collections_columns(self): def collections_columns(self):