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

Viewer: Fix svg links not working. Fixes #1857812 [Private bug](https://bugs.launchpad.net/calibre/+bug/1857812)

Browse Source
This commit is contained in:
Kovid Goyal 2019-12-29 20:07:07 +05:30
parent e5d6a6ef9f
commit 127fc7cffa
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/calibre/srv/render_book.py
View File

@ -369,6 +369,7 @@ def transform_svg_image(container, name, link_uid, virtualize_resources, virtual
def transform_html(container, name, virtualize_resources, link_uid, link_to_map, virtualized_names): def transform_html(container, name, virtualize_resources, link_uid, link_to_map, virtualized_names):
link_xpath = XPath('//h:a[@href]') link_xpath = XPath('//h:a[@href]')
svg_link_xpath = XPath('//svg:a')
img_xpath = XPath('//h:img[@src]') img_xpath = XPath('//h:img[@src]')
res_link_xpath = XPath('//h:link[@href]') res_link_xpath = XPath('//h:link[@href]')
root = container.parsed(name) root = container.parsed(name)
@ -404,15 +405,24 @@ def transform_html(container, name, virtualize_resources, link_uid, link_to_map,
if virtualize_resources: if virtualize_resources:
virtualize_html(container, name, link_uid, link_to_map, virtualized_names) virtualize_html(container, name, link_uid, link_to_map, virtualized_names)
else: else:
for a in link_xpath(root):
href = link_replacer(name, a.get('href')) def handle_link(a, attr='href'):
href = a.get(attr)
if href:
href = link_replacer(name, href)
if href and href.startswith(link_uid): if href and href.startswith(link_uid):
a.set('href', 'javascript:void(0)') a.set(attr, 'javascript:void(0)')
parts = decode_url(href.split('|')[1]) parts = decode_url(href.split('|')[1])
lname, lfrag = parts[0], parts[1] lname, lfrag = parts[0], parts[1]
link_to_map.setdefault(lname, {}).setdefault(lfrag or '', set()).add(name) link_to_map.setdefault(lname, {}).setdefault(lfrag or '', set()).add(name)
a.set('data-' + link_uid, json.dumps({'name':lname, 'frag':lfrag}, ensure_ascii=False)) a.set('data-' + link_uid, json.dumps({'name':lname, 'frag':lfrag}, ensure_ascii=False))
for a in link_xpath(root):
handle_link(a)
xhref = XLINK('href')
for a in svg_link_xpath(root):
handle_link(a, xhref)
shtml = html_as_json(root) shtml = html_as_json(root)
with container.open(name, 'wb') as f: with container.open(name, 'wb') as f:
f.write(shtml) f.write(shtml)
@ -518,23 +528,31 @@ def virtualize_html(container, name, link_uid, link_to_map, virtualized_names):
changed = set() changed = set()
link_xpath = XPath('//h:a[@href]') link_xpath = XPath('//h:a[@href]')
svg_link_xpath = XPath('//svg:a')
link_replacer = create_link_replacer(container, link_uid, changed) link_replacer = create_link_replacer(container, link_uid, changed)
virtualized_names.add(name) virtualized_names.add(name)
root = container.parsed(name) root = container.parsed(name)
rewrite_links(root, partial(link_replacer, name)) rewrite_links(root, partial(link_replacer, name))
for a in link_xpath(root):
href = a.get('href') def handle_link(a, attr='href'):
href = a.get(attr) or ''
if href.startswith(link_uid): if href.startswith(link_uid):
a.set('href', 'javascript:void(0)') a.set(attr, 'javascript:void(0)')
parts = decode_url(href.split('|')[1]) parts = decode_url(href.split('|')[1])
lname, lfrag = parts[0], parts[1] lname, lfrag = parts[0], parts[1]
link_to_map.setdefault(lname, {}).setdefault(lfrag or '', set()).add(name) link_to_map.setdefault(lname, {}).setdefault(lfrag or '', set()).add(name)
a.set('data-' + link_uid, json.dumps({'name':lname, 'frag':lfrag}, ensure_ascii=False)) a.set('data-' + link_uid, json.dumps({'name':lname, 'frag':lfrag}, ensure_ascii=False))
else: elif href:
a.set('target', '_blank') a.set('target', '_blank')
a.set('rel', 'noopener noreferrer') a.set('rel', 'noopener noreferrer')
for a in link_xpath(root):
handle_link(a)
xhref = XLINK('href')
for a in svg_link_xpath(root):
handle_link(a, xhref)
return name in changed return name in changed