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

Conversion pipeline: Ignore unparseable CSS instead of erroring out on it. Fixes #1034074 (ebook-convert error in html to mobi conversion)

Browse Source
This commit is contained in:
Kovid Goyal 2012-08-08 18:06:45 +05:30
parent 93662f06d6
commit aab1e91f50
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/ebooks/oeb/base.py
View File

@ -186,8 +186,9 @@ def rewrite_links(root, link_repl_func, resolve_base_href=False):
If the ``link_repl_func`` returns None, the attribute or If the ``link_repl_func`` returns None, the attribute or
tag text will be removed completely. tag text will be removed completely.
''' '''
from cssutils import parseString, parseStyle, replaceUrls, log from cssutils import replaceUrls, log, CSSParser
log.setLevel(logging.WARN) log.setLevel(logging.WARN)
log.raiseExceptions = False
if resolve_base_href: if resolve_base_href:
resolve_base_href(root) resolve_base_href(root)
@ -214,6 +215,8 @@ def rewrite_links(root, link_repl_func, resolve_base_href=False):
new = cur[:pos] + new_link + cur[pos+len(link):] new = cur[:pos] + new_link + cur[pos+len(link):]
el.attrib[attrib] = new el.attrib[attrib] = new
parser = CSSParser(raiseExceptions=False, log=_css_logger,
fetcher=lambda x:(None, None))
for el in root.iter(etree.Element): for el in root.iter(etree.Element):
try: try:
tag = el.tag tag = el.tag
@ -223,7 +226,7 @@ def rewrite_links(root, link_repl_func, resolve_base_href=False):
if tag == XHTML('style') and el.text and \ if tag == XHTML('style') and el.text and \
(_css_url_re.search(el.text) is not None or '@import' in (_css_url_re.search(el.text) is not None or '@import' in
el.text): el.text):
stylesheet = parseString(el.text, validate=False) stylesheet = parser.parseString(el.text, validate=False)
replaceUrls(stylesheet, link_repl_func) replaceUrls(stylesheet, link_repl_func)
repl = stylesheet.cssText repl = stylesheet.cssText
if isbytestring(repl): if isbytestring(repl):
@ -234,7 +237,7 @@ def rewrite_links(root, link_repl_func, resolve_base_href=False):
text = el.attrib['style'] text = el.attrib['style']
if _css_url_re.search(text) is not None: if _css_url_re.search(text) is not None:
try: try:
stext = parseStyle(text, validate=False) stext = parser.parseStyle(text, validate=False)
except: except:
# Parsing errors are raised by cssutils # Parsing errors are raised by cssutils
continue continue
@ -862,6 +865,7 @@ class Manifest(object):
def _parse_css(self, data): def _parse_css(self, data):
from cssutils import CSSParser, log, resolveImports from cssutils import CSSParser, log, resolveImports
log.setLevel(logging.WARN) log.setLevel(logging.WARN)
log.raiseExceptions = False
self.oeb.log.debug('Parsing', self.href, '...') self.oeb.log.debug('Parsing', self.href, '...')
data = self.oeb.decode(data) data = self.oeb.decode(data)
data = self.oeb.css_preprocessor(data, add_namespace=True) data = self.oeb.css_preprocessor(data, add_namespace=True)