Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-08 10:44:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

HTML Input: Fix error when converting HTML file with URL encoded filename. Fixes #1593632 [ebook-convert crashes on files with urlencoded characters in file name](https://bugs.launchpad.net/calibre/+bug/1593632)

Browse Source
This commit is contained in:
Kovid Goyal 2016-06-17 19:27:16 +05:30
parent eb1adb69de
commit 5cd5ba746c
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/calibre/ebooks/conversion/plugins/html_input.py
View File

@ -87,8 +87,8 @@ class HTMLInput(InputFormatPlugin):
return self._is_case_sensitive return self._is_case_sensitive
if not path or not os.path.exists(path): if not path or not os.path.exists(path):
return islinux or isbsd return islinux or isbsd
self._is_case_sensitive = not (os.path.exists(path.lower()) self._is_case_sensitive = not (os.path.exists(path.lower()) and
and os.path.exists(path.upper())) os.path.exists(path.upper()))
return self._is_case_sensitive return self._is_case_sensitive
def create_oebbook(self, htmlpath, basedir, opts, log, mi): def create_oebbook(self, htmlpath, basedir, opts, log, mi):
@ -96,7 +96,7 @@ class HTMLInput(InputFormatPlugin):
from calibre.ebooks.conversion.plumber import create_oebbook from calibre.ebooks.conversion.plumber import create_oebbook
from calibre.ebooks.oeb.base import (DirContainer, from calibre.ebooks.oeb.base import (DirContainer,
rewrite_links, urlnormalize, urldefrag, BINARY_MIME, OEB_STYLES, rewrite_links, urlnormalize, urldefrag, BINARY_MIME, OEB_STYLES,
xpath) xpath, urlquote)
from calibre import guess_type from calibre import guess_type
from calibre.ebooks.oeb.transforms.metadata import \ from calibre.ebooks.oeb.transforms.metadata import \
meta_info_to_oeb_metadata meta_info_to_oeb_metadata
@ -149,6 +149,8 @@ class HTMLInput(InputFormatPlugin):
href=ascii_filename(bname)) href=ascii_filename(bname))
htmlfile_map[path] = href htmlfile_map[path] = href
item = oeb.manifest.add(id, href, 'text/html') item = oeb.manifest.add(id, href, 'text/html')
if path == htmlpath and '%' in path:
bname = urlquote(bname)
item.html_input_href = bname item.html_input_href = bname
oeb.spine.add(item, True) oeb.spine.add(item, True)
@ -168,7 +170,11 @@ class HTMLInput(InputFormatPlugin):
path = f.path path = f.path
dpath = os.path.dirname(path) dpath = os.path.dirname(path)
oeb.container = DirContainer(dpath, log, ignore_opf=True) oeb.container = DirContainer(dpath, log, ignore_opf=True)
item = oeb.manifest.hrefs[htmlfile_map[path]] href = htmlfile_map[path]
try:
item = oeb.manifest.hrefs[href]
except KeyError:
item = oeb.manifest.hrefs[urlnormalize(href)]
rewrite_links(item.data, partial(self.resource_adder, base=dpath)) rewrite_links(item.data, partial(self.resource_adder, base=dpath))
for item in oeb.manifest.values(): for item in oeb.manifest.values():