mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-09 03:04:10 -04:00
Kobo hide the Previews and Recommendations on Touch with options to show
This commit is contained in:
parent
cb4ec8cd39
commit
0b58a43496
@ -25,7 +25,7 @@ class KOBO(USBMS):
|
|||||||
gui_name = 'Kobo Reader'
|
gui_name = 'Kobo Reader'
|
||||||
description = _('Communicate with the Kobo Reader')
|
description = _('Communicate with the Kobo Reader')
|
||||||
author = 'Timothy Legge'
|
author = 'Timothy Legge'
|
||||||
version = (1, 0, 11)
|
version = (1, 0, 12)
|
||||||
|
|
||||||
dbversion = 0
|
dbversion = 0
|
||||||
fwversion = 0
|
fwversion = 0
|
||||||
@ -67,19 +67,31 @@ class KOBO(USBMS):
|
|||||||
' in the datbase. With this option Calibre will show the '
|
' in the datbase. With this option Calibre will show the '
|
||||||
'expired records and allow you to delete them with '
|
'expired records and allow you to delete them with '
|
||||||
'the new delete logic.'),
|
'the new delete logic.'),
|
||||||
|
_('Show Previews') +
|
||||||
|
':::'+_('Kobo previews are included on the Touch and some other versions'
|
||||||
|
' by default they are no longer displayed as there is no good reason to '
|
||||||
|
'see them. Enable if you wish to see/delete them.'),
|
||||||
|
_('Show Recommendations') +
|
||||||
|
':::'+_('Kobo no shows recomendations on the device. In some case these have '
|
||||||
|
'files but in other cases they are just pointers to the web site to buy. '
|
||||||
|
'Enable if you wish to see/delete them.'),
|
||||||
]
|
]
|
||||||
|
|
||||||
EXTRA_CUSTOMIZATION_DEFAULT = [
|
EXTRA_CUSTOMIZATION_DEFAULT = [
|
||||||
', '.join(['tags']),
|
', '.join(['tags']),
|
||||||
True,
|
True,
|
||||||
True,
|
True,
|
||||||
True
|
True,
|
||||||
|
False,
|
||||||
|
False
|
||||||
]
|
]
|
||||||
|
|
||||||
OPT_COLLECTIONS = 0
|
OPT_COLLECTIONS = 0
|
||||||
OPT_UPLOAD_COVERS = 1
|
OPT_UPLOAD_COVERS = 1
|
||||||
OPT_UPLOAD_GRAYSCALE_COVERS = 2
|
OPT_UPLOAD_GRAYSCALE_COVERS = 2
|
||||||
OPT_SHOW_EXPIRED_BOOK_RECORDS = 3
|
OPT_SHOW_EXPIRED_BOOK_RECORDS = 3
|
||||||
|
OPT_SHOW_PREVIEWS = 4
|
||||||
|
OPT_SHOW_RECOMMENDATIONS = 5
|
||||||
|
|
||||||
def initialize(self):
|
def initialize(self):
|
||||||
USBMS.initialize(self)
|
USBMS.initialize(self)
|
||||||
@ -161,6 +173,8 @@ class KOBO(USBMS):
|
|||||||
# Label Previews
|
# Label Previews
|
||||||
if accessibility == 6:
|
if accessibility == 6:
|
||||||
playlist_map[lpath].append('Preview')
|
playlist_map[lpath].append('Preview')
|
||||||
|
elif accessibility == 4:
|
||||||
|
playlist_map[lpath].append('Recommendation')
|
||||||
|
|
||||||
path = self.normalize_path(path)
|
path = self.normalize_path(path)
|
||||||
# print "Normalized FileName: " + path
|
# print "Normalized FileName: " + path
|
||||||
@ -241,31 +255,40 @@ class KOBO(USBMS):
|
|||||||
debug_print("Database Version: ", self.dbversion)
|
debug_print("Database Version: ", self.dbversion)
|
||||||
|
|
||||||
opts = self.settings()
|
opts = self.settings()
|
||||||
if self.dbversion >= 16:
|
if self.dbversion >= 33:
|
||||||
query= ('select Title, Attribution, DateCreated, ContentID, MimeType, ContentType, ' \
|
query= ('select Title, Attribution, DateCreated, ContentID, MimeType, ContentType, ' \
|
||||||
'ImageID, ReadStatus, ___ExpirationStatus, FavouritesIndex, Accessibility from content where ' \
|
'ImageID, ReadStatus, ___ExpirationStatus, FavouritesIndex, Accessibility, IsDownloaded from content where ' \
|
||||||
|
'BookID is Null %(previews)s %(recomendations)s and not ((___ExpirationStatus=3 or ___ExpirationStatus is Null) %(expiry)s') % dict(expiry=' and ContentType = 6)' \
|
||||||
|
if opts.extra_customization[self.OPT_SHOW_EXPIRED_BOOK_RECORDS] else ')', \
|
||||||
|
previews=' and Accessibility <> 6' \
|
||||||
|
if opts.extra_customization[self.OPT_SHOW_PREVIEWS] == False else '', \
|
||||||
|
recomendations=' and IsDownloaded in (\'true\', 1)' \
|
||||||
|
if opts.extra_customization[self.OPT_SHOW_RECOMMENDATIONS] == False else '')
|
||||||
|
elif self.dbversion >= 16 and self.dbversion < 33:
|
||||||
|
query= ('select Title, Attribution, DateCreated, ContentID, MimeType, ContentType, ' \
|
||||||
|
'ImageID, ReadStatus, ___ExpirationStatus, FavouritesIndex, Accessibility, "1" as IsDownloaded from content where ' \
|
||||||
'BookID is Null and not ((___ExpirationStatus=3 or ___ExpirationStatus is Null) %(expiry)s') % dict(expiry=' and ContentType = 6)' \
|
'BookID is Null and not ((___ExpirationStatus=3 or ___ExpirationStatus is Null) %(expiry)s') % dict(expiry=' and ContentType = 6)' \
|
||||||
if opts.extra_customization[self.OPT_SHOW_EXPIRED_BOOK_RECORDS] else ')')
|
if opts.extra_customization[self.OPT_SHOW_EXPIRED_BOOK_RECORDS] else ')')
|
||||||
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, FavouritesIndex, "-1" as Accessibility from content where ' \
|
'ImageID, ReadStatus, ___ExpirationStatus, FavouritesIndex, "-1" as Accessibility, "1" as IsDownloaded from content where ' \
|
||||||
'BookID is Null and not ((___ExpirationStatus=3 or ___ExpirationStatus is Null) %(expiry)s') % dict(expiry=' and ContentType = 6)' \
|
'BookID is Null and not ((___ExpirationStatus=3 or ___ExpirationStatus is Null) %(expiry)s') % dict(expiry=' and ContentType = 6)' \
|
||||||
if opts.extra_customization[self.OPT_SHOW_EXPIRED_BOOK_RECORDS] else ')')
|
if opts.extra_customization[self.OPT_SHOW_EXPIRED_BOOK_RECORDS] else ')')
|
||||||
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, ' \
|
||||||
'ImageID, ReadStatus, ___ExpirationStatus, "-1" as FavouritesIndex, "-1" as Accessibility from content where ' \
|
'ImageID, ReadStatus, ___ExpirationStatus, "-1" as FavouritesIndex, "-1" as Accessibility, "1" as IsDownloaded from content where ' \
|
||||||
'BookID is Null and not ((___ExpirationStatus=3 or ___ExpirationStatus is Null) %(expiry)s') % dict(expiry=' and ContentType = 6)' \
|
'BookID is Null and not ((___ExpirationStatus=3 or ___ExpirationStatus is Null) %(expiry)s') % dict(expiry=' and ContentType = 6)' \
|
||||||
if opts.extra_customization[self.OPT_SHOW_EXPIRED_BOOK_RECORDS] else ')')
|
if opts.extra_customization[self.OPT_SHOW_EXPIRED_BOOK_RECORDS] else ')')
|
||||||
else:
|
else:
|
||||||
query= 'select Title, Attribution, DateCreated, ContentID, MimeType, ContentType, ' \
|
query= 'select Title, Attribution, DateCreated, ContentID, MimeType, ContentType, ' \
|
||||||
'ImageID, ReadStatus, "-1" as ___ExpirationStatus, "-1" as FavouritesIndex, "-1" as Accessibility from content where BookID is Null'
|
'ImageID, ReadStatus, "-1" as ___ExpirationStatus, "-1" as FavouritesIndex, "-1" as Accessibility, "1" as IsDownloaded from content where BookID is Null'
|
||||||
|
|
||||||
try:
|
try:
|
||||||
cursor.execute (query)
|
cursor.execute (query)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
err = str(e)
|
err = str(e)
|
||||||
if not ('___ExpirationStatus' in err or 'FavouritesIndex' in err or
|
if not ('___ExpirationStatus' in err or 'FavouritesIndex' in err or
|
||||||
'Accessibility' in err):
|
'Accessibility' in err or 'IsDownloaded' in err):
|
||||||
raise
|
raise
|
||||||
query= ('select Title, Attribution, DateCreated, ContentID, MimeType, ContentType, '
|
query= ('select Title, Attribution, DateCreated, ContentID, MimeType, ContentType, '
|
||||||
'ImageID, ReadStatus, "-1" as ___ExpirationStatus, "-1" as '
|
'ImageID, ReadStatus, "-1" as ___ExpirationStatus, "-1" as '
|
||||||
@ -701,6 +724,7 @@ class KOBO(USBMS):
|
|||||||
|
|
||||||
accessibilitylist = {
|
accessibilitylist = {
|
||||||
"Preview":6,
|
"Preview":6,
|
||||||
|
"Recommendation":4,
|
||||||
}
|
}
|
||||||
# debug_print('Starting update_device_database_collections', collections_attributes)
|
# debug_print('Starting update_device_database_collections', collections_attributes)
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user