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

EPUB Input: Do no skip the valid children of an NCX node that has no text/href

Browse Source
This commit is contained in:
Kovid Goyal 2012-05-30 19:32:47 +05:30
parent 7aa4f83fed
commit bf3913b791
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/calibre/ebooks/oeb/reader.py
View File

@ -363,12 +363,23 @@ class OEBReader(object):
title = ''.join(xpath(child, 'ncx:navLabel/ncx:text/text()')) title = ''.join(xpath(child, 'ncx:navLabel/ncx:text/text()'))
title = COLLAPSE_RE.sub(' ', title.strip()) title = COLLAPSE_RE.sub(' ', title.strip())
href = xpath(child, 'ncx:content/@src') href = xpath(child, 'ncx:content/@src')
if not title or not href: if not title:
self._toc_from_navpoint(item, toc, child)
continue continue
if not href:
gc = xpath(child, 'ncx:navPoint')
if not gc:
# This node is useless
continue
href = 'missing.html'
href = item.abshref(urlnormalize(href[0])) href = item.abshref(urlnormalize(href[0]))
path, _ = urldefrag(href) path, _ = urldefrag(href)
if path not in self.oeb.manifest.hrefs: if path not in self.oeb.manifest.hrefs:
self.logger.warn('TOC reference %r not found' % href) self.logger.warn('TOC reference %r not found' % href)
gc = xpath(child, 'ncx:navPoint')
if not gc:
# This node is useless
continue continue
id = child.get('id') id = child.get('id')
klass = child.get('class', 'chapter') klass = child.get('class', 'chapter')