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

Do not error out when removing old cover if there are images with invalid URLs in the HTML

Browse Source
This commit is contained in:
Kovid Goyal 2016-10-13 06:08:29 +05:30
parent 42b0acbfa3
commit e1c0cbf9e4
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/calibre/ebooks/oeb/transforms/metadata.py
View File

@ -171,11 +171,14 @@ class MergeMetadata(object):
for item in self.oeb.spine: for item in self.oeb.spine:
try: try:
images = XPath('//h:img[@src]')(item.data) images = XPath('//h:img[@src]')(item.data)
except: except Exception:
images = [] images = ()
removed = False removed = False
for img in images: for img in images:
href = item.abshref(img.get('src')) try:
href = item.abshref(img.get('src'))
except Exception:
continue # Invalid URL, ignore
if href == cover_item.href: if href == cover_item.href:
img.getparent().remove(img) img.getparent().remove(img)
removed = True removed = True
@ -195,6 +198,3 @@ class MergeMetadata(object):
' the cover image'%item.href) ' the cover image'%item.href)
self.oeb.spine.remove(item) self.oeb.spine.remove(item)
self.oeb.manifest.remove(item) self.oeb.manifest.remove(item)