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: Update to support new firmware from Kobo. Fixes #1382051 [Kobo: Skip modifying epub if no valid CSS rules and bump firmware version](https://bugs.launchpad.net/calibre/+bug/1382051)

Browse Source 
Skip modifying epub if no valid CSS rules and bump firmware version

While looking at a problem with the stylesheet on Kobo devices recently,
I realised that if the modify CSS option was set and the was no file, it
still modified the stylesheet. Now, will not do this if there are no
valid rules in the kobo_extra.css file.

Also bumping firmware version to 3.11.1. Kobo are about to release an
update. They big jump on version number is to match the desktop
application version.
This commit is contained in:
David Forrester 2014-10-16 23:50:51 +11:00 committed by Kovid Goyal
parent ee90f8579e
commit 9943fff0b4
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,7 +68,7 @@ class KOBO(USBMS):
dbversion = 0
fwversion = 0
supported_dbversion = 105
supported_dbversion = 112
has_kepubs = False
supported_platforms = ['windows', 'osx', 'linux']
@ -1256,7 +1256,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)
# icon = I('devices/kobotouch.jpg')
supported_dbversion = 105
supported_dbversion = 112
min_supported_dbversion = 53
min_dbversion_series = 65
min_dbversion_externalid = 65
@ -1265,7 +1265,7 @@ class KOBOTOUCH(KOBO):
min_dbversion_activity = 77
min_dbversion_keywords = 82
max_supported_fwversion = (3, 8, 1)
max_supported_fwversion = (3, 11, 1)
min_fwversion_shelves = (2, 0, 0)
min_fwversion_images_on_sdcard = (2, 4, 1)
min_fwversion_images_tree = (2, 9, 0) # Cover images stored in tree under .kobo-images
@ -1882,6 +1882,9 @@ class KOBOTOUCH(KOBO):
try:
extra_sheet = cssparseFile(extra_css_path)
debug_print("KoboTouch:get_extra_css: Using extra CSS in {0} ({1} rules)".format(extra_css_path, len(extra_sheet.cssRules)))
if len(extra_sheet.cssRules) ==0:
debug_print("KoboTouch:get_extra_css: Extra CSS file has no valid rules. CSS will not be modified.")
extra_sheet = None
except Exception as e:
debug_print("KoboTouch:get_extra_css: Problem parsing extra CSS file {0}".format(extra_css_path))
debug_print("KoboTouch:get_extra_css: Exception {0}".format(e))
@ -1946,6 +1949,7 @@ class KOBOTOUCH(KOBO):
# Currently only modifying CSS, so if no stylesheet, don't do anything
if not self.extra_sheet:
debug_print("KoboTouch:_modify_epub: no CSS file")
return True
commit_container = False