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 pipeline: When adding/removing entries to the manifest, ignore unparseable URLs instead of erroring out on them

Browse Source
This commit is contained in:
Kovid Goyal 2011-07-19 09:50:02 -06:00
parent 9cc367ae24
commit c7ea8f4886
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -188,8 +188,13 @@ class OEBReader(object):
href, _ = urldefrag(href) href, _ = urldefrag(href)
if not href: if not href:
continue continue
href = item.abshref(urlnormalize(href)) try:
scheme = urlparse(href).scheme href = item.abshref(urlnormalize(href))
scheme = urlparse(href).scheme
except:
self.oeb.log.exception(
'Skipping invalid href: %r'%href)
continue
if not scheme and href not in known: if not scheme and href not in known:
new.add(href) new.add(href)
elif item.media_type in OEB_STYLES: elif item.media_type in OEB_STYLES:

5
src/calibre/ebooks/oeb/transforms/trimmanifest.py
View File

@ -47,7 +47,10 @@ class ManifestTrimmer(object):
item.data is not None: item.data is not None:
hrefs = [r[2] for r in iterlinks(item.data)] hrefs = [r[2] for r in iterlinks(item.data)]
for href in hrefs: for href in hrefs:
href = item.abshref(urlnormalize(href)) try:
href = item.abshref(urlnormalize(href))
except:
continue
if href in oeb.manifest.hrefs: if href in oeb.manifest.hrefs:
found = oeb.manifest.hrefs[href] found = oeb.manifest.hrefs[href]
if found not in used: if found not in used: