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 bug 807832 FavouritesIndex only in dbversion > 14

Browse Source
This commit is contained in:
Timothy Legge 2011-07-09 21:48:09 -02:30
parent 8fc02ccdb0
commit 7a1c843080
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -214,7 +214,7 @@ class KOBO(USBMS):
'BookID is Null and ( ___ExpirationStatus <> "3" or ___ExpirationStatus is Null)' 'BookID is Null and ( ___ExpirationStatus <> "3" or ___ExpirationStatus is Null)'
elif self.dbversion < 16 and self.dbversion >= 14: elif self.dbversion < 16 and self.dbversion >= 14:
query= 'select Title, Attribution, DateCreated, ContentID, MimeType, ContentType, ' \ query= 'select Title, Attribution, DateCreated, ContentID, MimeType, ContentType, ' \
'ImageID, ReadStatus, ___ExpirationStatus, "-1" as FavouritesIndex, "-1" as Accessibility from content where ' \ 'ImageID, ReadStatus, ___ExpirationStatus, FavouritesIndex, "-1" as Accessibility from content where ' \
'BookID is Null and ( ___ExpirationStatus <> "3" or ___ExpirationStatus is Null)' 'BookID is Null and ( ___ExpirationStatus <> "3" or ___ExpirationStatus is Null)'
elif self.dbversion < 14 and self.dbversion >= 8: elif self.dbversion < 14 and self.dbversion >= 8:
query= 'select Title, Attribution, DateCreated, ContentID, MimeType, ContentType, ' \ query= 'select Title, Attribution, DateCreated, ContentID, MimeType, ContentType, ' \
@ -673,7 +673,8 @@ class KOBO(USBMS):
# 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
self.reset_readstatus(connection, oncard) self.reset_readstatus(connection, oncard)
self.reset_favouritesindex(connection, oncard) if self.dbversion >= 14:
self.reset_favouritesindex(connection, oncard)
# Process any collections that exist # Process any collections that exist
for category, books in collections.items(): for category, books in collections.items():
@ -691,7 +692,7 @@ class KOBO(USBMS):
if category in readstatuslist.keys(): if category in readstatuslist.keys():
# Manage ReadStatus # Manage ReadStatus
self.set_readstatus(connection, ContentID, readstatuslist.get(category)) self.set_readstatus(connection, ContentID, readstatuslist.get(category))
if category == 'Shortlist': if category == 'Shortlist' and self.dbversion >= 14:
# Manage FavouritesIndex/Shortlist # Manage FavouritesIndex/Shortlist
self.set_favouritesindex(connection, ContentID) self.set_favouritesindex(connection, ContentID)
if category in accessibilitylist.keys(): if category in accessibilitylist.keys():
@ -701,8 +702,9 @@ class KOBO(USBMS):
# Since no collections exist the ReadStatus needs to be reset to 0 (Unread) # Since no collections exist the ReadStatus needs to be reset to 0 (Unread)
debug_print("No Collections - reseting ReadStatus") debug_print("No Collections - reseting ReadStatus")
self.reset_readstatus(connection, oncard) self.reset_readstatus(connection, oncard)
debug_print("No Collections - reseting FavouritesIndex") if self.dbversion >= 14:
self.reset_favouritesindex(connection, oncard) debug_print("No Collections - reseting FavouritesIndex")
self.reset_favouritesindex(connection, oncard)
connection.close() connection.close()