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

Kobo driver: Bmp firmware version, sanitize file names

Browse Source 
Kobo have release firmware 3.17.0. There are no changes needed for the
driver except the supported version numbers. Plus one in case,

Also adding filename sanitization. This should have been done before
especially when sending kepubs was added This sanitization has been
copied from the KoboTouchExtended driver. Fixes #1484516 [Kobo firmware 3.17.0, sanitize file names](https://bugs.launchpad.net/calibre/+bug/1484516)
This commit is contained in:
David 2015-08-13 22:26:36 +10:00 committed by Kovid Goyal
parent cae14a92b9
commit 04a7fee292
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,7 +13,7 @@ Originally developed by Timothy Legge <timlegge@gmail.com>.
Extended to support Touch firmware 2.0.0 and later and newer devices by David Forrester <davidfor@internode.on.net> Extended to support Touch firmware 2.0.0 and later and newer devices by David Forrester <davidfor@internode.on.net>
''' '''
import os, time, shutil import os, time, shutil, re
from contextlib import closing from contextlib import closing
from calibre.devices.usbms.books import BookList from calibre.devices.usbms.books import BookList
@ -64,11 +64,11 @@ 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 and David Forrester' author = 'Timothy Legge and David Forrester'
version = (2, 1, 9) version = (2, 1, 10)
dbversion = 0 dbversion = 0
fwversion = 0 fwversion = 0
supported_dbversion = 120 supported_dbversion = 125
has_kepubs = False has_kepubs = False
supported_platforms = ['windows', 'osx', 'linux'] supported_platforms = ['windows', 'osx', 'linux']
@ -145,6 +145,8 @@ class KOBO(USBMS):
OPT_SHOW_RECOMMENDATIONS = 5 OPT_SHOW_RECOMMENDATIONS = 5
OPT_SUPPORT_NEWER_FIRMWARE = 6 OPT_SUPPORT_NEWER_FIRMWARE = 6
invalid_filename_chars_re = re.compile(r'[\/\\\?%\*:;\|\"\'><\$!]', re.IGNORECASE | re.UNICODE)
def initialize(self): def initialize(self):
USBMS.initialize(self) USBMS.initialize(self)
self.dbversion = 7 self.dbversion = 7
@ -152,6 +154,9 @@ class KOBO(USBMS):
def device_database_path(self): def device_database_path(self):
return self.normalize_path(self._main_prefix + '.kobo/KoboReader.sqlite') return self.normalize_path(self._main_prefix + '.kobo/KoboReader.sqlite')
def sanitize_path_components(self, components):
return [self.invalid_filename_chars_re.sub('_', x) for x in components]
def books(self, oncard=None, end_session=True): def books(self, oncard=None, end_session=True):
from calibre.ebooks.metadata.meta import path_to_ext from calibre.ebooks.metadata.meta import path_to_ext
@ -1256,7 +1261,7 @@ class KOBOTOUCH(KOBO):
description = 'Communicate with the Kobo Touch, Glo, Mini and Aura HD ereaders. Based on the existing Kobo driver by %s.' % (KOBO.author) description = 'Communicate with the Kobo Touch, Glo, Mini and Aura HD ereaders. Based on the existing Kobo driver by %s.' % (KOBO.author)
# icon = I('devices/kobotouch.jpg') # icon = I('devices/kobotouch.jpg')
supported_dbversion = 120 supported_dbversion = 125
min_supported_dbversion = 53 min_supported_dbversion = 53
min_dbversion_series = 65 min_dbversion_series = 65
min_dbversion_externalid = 65 min_dbversion_externalid = 65
@ -1265,7 +1270,7 @@ class KOBOTOUCH(KOBO):
min_dbversion_activity = 77 min_dbversion_activity = 77
min_dbversion_keywords = 82 min_dbversion_keywords = 82
max_supported_fwversion = (3, 16, 11) max_supported_fwversion = (3, 17, 1)
# The following document firwmare versions where new function or devices were added. # 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. # 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)