mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-09 03:04:10 -04:00
Merge branch 'tolino_5_6_209315' of https://github.com/beedaddy/calibre
This commit is contained in:
commit
0483d5f22f
@ -1427,7 +1427,7 @@ class KOBOTOUCH(KOBO):
|
|||||||
' Based on the existing Kobo driver by %s.') % KOBO.author
|
' Based on the existing Kobo driver by %s.') % KOBO.author
|
||||||
# icon = 'devices/kobotouch.jpg'
|
# icon = 'devices/kobotouch.jpg'
|
||||||
|
|
||||||
supported_dbversion = 190
|
supported_dbversion = 191
|
||||||
min_supported_dbversion = 53
|
min_supported_dbversion = 53
|
||||||
min_dbversion_series = 65
|
min_dbversion_series = 65
|
||||||
min_dbversion_externalid = 65
|
min_dbversion_externalid = 65
|
||||||
@ -1442,7 +1442,7 @@ class KOBOTOUCH(KOBO):
|
|||||||
# Starting with firmware version 3.19.x, the last number appears to be is a
|
# 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
|
# build number. A number will be recorded here but it can be safely ignored
|
||||||
# when testing the firmware version.
|
# when testing the firmware version.
|
||||||
max_supported_fwversion = (5, 4, 197982)
|
max_supported_fwversion = (5, 6, 209315)
|
||||||
# The following document firmware versions where new function or devices were added.
|
# The following document firmware versions where new function or devices were added.
|
||||||
# Not all are used, but this feels a good place to record it.
|
# Not all are used, but this feels a good place to record it.
|
||||||
min_fwversion_shelves = (2, 0, 0)
|
min_fwversion_shelves = (2, 0, 0)
|
||||||
@ -2852,7 +2852,12 @@ class KOBOTOUCH(KOBO):
|
|||||||
ImageID = ContentID.replace('/', '_')
|
ImageID = ContentID.replace('/', '_')
|
||||||
ImageID = ImageID.replace(' ', '_')
|
ImageID = ImageID.replace(' ', '_')
|
||||||
ImageID = ImageID.replace(':', '_')
|
ImageID = ImageID.replace(':', '_')
|
||||||
ImageID = ImageID.replace('.', '_')
|
if self.isTolinoDevice() and self.dbversion >= 191:
|
||||||
|
ImageID_split = ImageID.rsplit('.', 1)
|
||||||
|
ImageID_split[0] = ImageID_split[0].replace('.', '_')
|
||||||
|
ImageId = '.'.join(ImageID_split)
|
||||||
|
else:
|
||||||
|
ImageID = ImageID.replace('.', '_')
|
||||||
return ImageID
|
return ImageID
|
||||||
|
|
||||||
def images_path(self, path, imageId=None):
|
def images_path(self, path, imageId=None):
|
||||||
|
Loading…
x
Reference in New Issue
Block a user