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

HTML Input: Fix incorrect parsing of file names in href/src attributes that contain percent encoded non-ascii characters. Fixes #1281099 [No images/pictures while html to epub conversion since update to 1.24 !!](https://bugs.launchpad.net/calibre/+bug/1281099)

Browse Source
This commit is contained in:
Kovid Goyal 2014-02-17 21:05:44 +05:30
parent 73ff7bd9ae
commit 39287d31fe
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/calibre/ebooks/html/input.py
View File

@ -13,8 +13,8 @@ Input plugin for HTML or OPF ebooks.
import os, re, sys, errno as gerrno import os, re, sys, errno as gerrno
from urlparse import urlparse, urlunparse from urlparse import urlparse, urlunparse
from urllib import unquote
from calibre.ebooks.oeb.base import urlunquote
from calibre.ebooks.chardet import detect_xml_encoding from calibre.ebooks.chardet import detect_xml_encoding
from calibre.constants import iswindows from calibre.constants import iswindows
from calibre import unicode_path, as_unicode, replace_entities from calibre import unicode_path, as_unicode, replace_entities
@ -33,7 +33,7 @@ class Link(object):
path = path[1:] path = path[1:]
isabs = True isabs = True
path = urlunparse(('', '', path, url.params, url.query, '')) path = urlunparse(('', '', path, url.params, url.query, ''))
path = unquote(path) path = urlunquote(path)
if isabs or os.path.isabs(path): if isabs or os.path.isabs(path):
return path return path
return os.path.abspath(os.path.join(base, path)) return os.path.abspath(os.path.join(base, path))
@ -50,7 +50,7 @@ class Link(object):
self.is_local = self.parsed_url.scheme in ('', 'file') self.is_local = self.parsed_url.scheme in ('', 'file')
self.is_internal = self.is_local and not bool(self.parsed_url.path) self.is_internal = self.is_local and not bool(self.parsed_url.path)
self.path = None self.path = None
self.fragment = unquote(self.parsed_url.fragment) self.fragment = urlunquote(self.parsed_url.fragment)
if self.is_local and not self.is_internal: if self.is_local and not self.is_internal:
self.path = self.url_to_local_path(self.parsed_url, base) self.path = self.url_to_local_path(self.parsed_url, base)