Backup_Repos/calibre
1
0
Fork 0
mirror of git://github.com/kovidgoyal/calibre.git synced 2026-05-08 16:33:43 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/davidfor/calibre into master

Browse source
This commit is contained in:
Kovid Goyal 2020-08-12 19:49:15 +05:30
commit 51742e7771
No known key found for this signature in database
GPG key ID: 06BC317B515ACE7C
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/calibre/devices/kobo/driver.py
View file

@ -1362,7 +1362,7 @@ class KOBOTOUCH(KOBO):
# Starting with firmware version 3.19.x, the last number appears to be is a
# build number. A number will be recorded here but it can be safely ignored
# when testing the firmware version.
max_supported_fwversion = (4, 22, 15190)
max_supported_fwversion = (4, 23, 15439)
# The following document firwmare versions where new function or devices were added.
# Not all are used, but this feels a good place to record it.
min_fwversion_shelves = (2, 0, 0)
@ -1684,9 +1684,12 @@ def update_booklist(prefix, path, ContentID, ContentType, MimeType, ImageID,
elif accessibility == 4: # Pre 2.x.x firmware
playlist_map[lpath].append('Recommendation')
allow_shelves = False
elif accessibility == 8: # From 4.22 but waa probably there earlier.
playlist_map[lpath].append('Kobo Plus')
allow_shelves = True
elif accessibility == 9: # From 4.0 on Aura One
playlist_map[lpath].append('OverDrive')
allow_shelves = False
allow_shelves = True
kobo_collections = playlist_map[lpath][:]
@ -1898,7 +1901,7 @@ def get_bookshelvesforbook(connection, ContentID):
expiry="" if self.show_archived_books else "and IsDownloaded in ('true', 1)",
previews=" OR (Accessibility in (6) AND ___UserID <> '')" if self.show_previews else "",
recomendations=" OR (Accessibility IN (-1, 4, 6) AND ___UserId = '')" if self.show_recommendations else "",
downloaded_accessibility="1,2,9" if self.supports_overdrive() else "1,2"
downloaded_accessibility="1,2,8,9" if self.supports_overdrive() else "1,2"
)
elif self.supports_series():
where_clause = (" WHERE BookID IS NULL "