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 few mindless OPF-parsing bugs.

Browse Source
This commit is contained in:
Marshall T. Vandegrift 2009-02-02 17:57:52 -05:00
parent cecfa09b95
commit f524968ce2
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/calibre/ebooks/oeb/base.py
View File

@ -1048,7 +1048,7 @@ class OEBBook(object):
haveuuid = True haveuuid = True
if 'id' in ident.attrib: if 'id' in ident.attrib:
haveid = True haveid = True
if not haveuuid and haveid: if not (haveuuid and haveid):
bookid = "urn:uuid:%s" % str(uuid.uuid4()) bookid = "urn:uuid:%s" % str(uuid.uuid4())
metadata.add('identifier', bookid, id='calibre-uuid') metadata.add('identifier', bookid, id='calibre-uuid')
if uid is None: if uid is None:
@ -1235,13 +1235,13 @@ class OEBBook(object):
if not item.linear: continue if not item.linear: continue
html = item.data html = item.data
title = ''.join(xpath(html, '/h:html/h:head/h:title/text()')) title = ''.join(xpath(html, '/h:html/h:head/h:title/text()'))
title = COLLAPSE_RE(' ', title.strip()) title = COLLAPSE_RE.sub(' ', title.strip())
if title: if title:
titles.append(title) titles.append(title)
headers.append('(unlabled)') headers.append('(unlabled)')
for tag in ('h1', 'h2', 'h3', 'h4', 'h5', 'strong'): for tag in ('h1', 'h2', 'h3', 'h4', 'h5', 'strong'):
expr = '/h:html/h:body//h:%s[position()=1]/text()' expr = '/h:html/h:body//h:%s[position()=1]/text()'
header = ''.join(xpath(html % tag, expr)) header = ''.join(xpath(html, expr % tag))
header = COLLAPSE_RE.sub(' ', header.strip()) header = COLLAPSE_RE.sub(' ', header.strip())
if header: if header:
headers[-1] = header headers[-1] = header