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

Kobo driver: Fix a regression that broke handling of reading status for devices running old 1.9x versions of the Kobo firmware

Browse Source 
Merge branch 'master' of https://github.com/davidfor/calibre
This commit is contained in:
Kovid Goyal 2016-10-19 18:22:18 +05:30
commit 7cd1f5d9da
1 changed files with 84 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2248,7 +2248,8 @@ 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:
if collections:
# debug_print("KoboTouch:update_device_database_collections - length collections=" + unicode(len(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
@ -2302,6 +2303,7 @@ class KOBOTOUCH(KOBO):
self.set_bookshelf(connection, book, category) self.set_bookshelf(connection, book, category)
category_added = True category_added = True
elif category in readstatuslist.keys(): elif category in readstatuslist.keys():
debug_print("KoboTouch:update_device_database_collections - about to set_readstatus - category='%s'"%(category, ))
# Manage ReadStatus # Manage ReadStatus
self.set_readstatus(connection, book.contentID, readstatuslist.get(category)) self.set_readstatus(connection, book.contentID, readstatuslist.get(category))
category_added = True category_added = True
@ -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):