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

Fix a metadata error. Add parsing @import queries.

Browse Source
This commit is contained in:
Marshall T. Vandegrift 2008-12-12 10:45:49 -05:00
parent c6d7e31ea1
commit 04ebf1ec20
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/ebooks/lit/oeb.py
View File

@ -172,7 +172,7 @@ class Metadata(object):
def add(self, term, value, attrib={}): def add(self, term, value, attrib={}):
item = self.Item(term, value, attrib) item = self.Item(term, value, attrib)
items = self.items[barename(term)] items = self.items[barename(item.term)]
items.append(item) items.append(item)
return item return item

8
src/calibre/ebooks/lit/stylizer.py
View File

@ -122,12 +122,14 @@ class Stylizer(object):
basename = os.path.basename(path) basename = os.path.basename(path)
cssname = os.path.splitext(basename)[0] + '.css' cssname = os.path.splitext(basename)[0] + '.css'
stylesheets = [HTML_CSS_STYLESHEET] stylesheets = [HTML_CSS_STYLESHEET]
head = xpath(tree, '/h:html/h:head')[0] head = xpath(tree, '/h:html/h:head')[0]
parser = cssutils.CSSParser()
parser.setFetcher(lambda path: ('utf-8', oeb.container.read(path)))
for elem in head: for elem in head:
tag = barename(elem.tag) tag = barename(elem.tag)
if tag == 'style': if tag == 'style':
text = ''.join(elem.text) text = ''.join(elem.text)
stylesheet = cssutils.parseString(text, href=cssname) stylesheet = parser.parseString(text, href=cssname)
stylesheets.append(stylesheet) stylesheets.append(stylesheet)
elif tag == 'link' \ elif tag == 'link' \
and elem.get('rel', 'stylesheet') == 'stylesheet' \ and elem.get('rel', 'stylesheet') == 'stylesheet' \
@ -140,7 +142,7 @@ class Stylizer(object):
else: else:
data = XHTML_CSS_NAMESPACE data = XHTML_CSS_NAMESPACE
data += oeb.manifest.hrefs[path].data data += oeb.manifest.hrefs[path].data
stylesheet = cssutils.parseString(data, href=path) stylesheet = parser.parseString(data, href=path)
self.STYLESHEETS[path] = stylesheet self.STYLESHEETS[path] = stylesheet
stylesheets.append(stylesheet) stylesheets.append(stylesheet)
rules = [] rules = []