From e1c0cbf9e44031cda1c61e4e92a69fdc410e0cfd Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Thu, 13 Oct 2016 06:08:29 +0530 Subject: [PATCH] Do not error out when removing old cover if there are images with invalid URLs in the HTML --- src/calibre/ebooks/oeb/transforms/metadata.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/calibre/ebooks/oeb/transforms/metadata.py b/src/calibre/ebooks/oeb/transforms/metadata.py index b1141f72b4..dbbdeb3c52 100644 --- a/src/calibre/ebooks/oeb/transforms/metadata.py +++ b/src/calibre/ebooks/oeb/transforms/metadata.py @@ -171,11 +171,14 @@ class MergeMetadata(object): for item in self.oeb.spine: try: images = XPath('//h:img[@src]')(item.data) - except: - images = [] + except Exception: + images = () removed = False 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: img.getparent().remove(img) removed = True @@ -195,6 +198,3 @@ class MergeMetadata(object): ' the cover image'%item.href) self.oeb.spine.remove(item) self.oeb.manifest.remove(item) - - -