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: Fix a bug in removal of invalid entries from the spine, where not all invalid entries were removed, causing conversion to fail. Fixes #1086054 (ePub->MOBI conversion fails (url of input included))

Browse Source
This commit is contained in:
Kovid Goyal 2012-12-04 10:09:42 +05:30
parent e26b9f770e
commit f53daffda9
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -320,13 +320,11 @@ class OEBReader(object):
self.logger.warn(u'Spine item %r not found' % idref) self.logger.warn(u'Spine item %r not found' % idref)
continue continue
item = manifest.ids[idref] item = manifest.ids[idref]
spine.add(item, elem.get('linear')) if item.media_type.lower() in OEB_DOCS and hasattr(item.data, 'xpath'):
for item in spine: spine.add(item, elem.get('linear'))
if item.media_type.lower() not in OEB_DOCS: else:
if not hasattr(item.data, 'xpath'): self.oeb.log.warn('The item %s is not a XML document.'
self.oeb.log.warn('The item %s is not a XML document.' ' Removing it from spine.'%item.href)
' Removing it from spine.'%item.href)
spine.remove(item)
if len(spine) == 0: if len(spine) == 0:
raise OEBError("Spine is empty") raise OEBError("Spine is empty")
self._spine_add_extra() self._spine_add_extra()