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

CHM Input: resolve absolute links to resource files from the root of the CHM file. Fixes #2023431 [Private bug](https://bugs.launchpad.net/calibre/+bug/2023431)

Browse Source 
Previously they would have been ignored or caused an error on Windows.
This commit is contained in:
Kovid Goyal 2023-06-10 12:15:02 +05:30
parent 68f4b773f1
commit fdb68a1613
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/calibre/ebooks/conversion/plugins/chm_input.py
View File

@ -104,6 +104,7 @@ class CHMInput(InputFormatPlugin):
opts.breadth_first = True opts.breadth_first = True
htmlinput = HTMLInput(None) htmlinput = HTMLInput(None)
htmlinput.set_root_dir_of_input(basedir) htmlinput.set_root_dir_of_input(basedir)
htmlinput.root_dir_for_absolute_links = basedir
oeb = htmlinput.create_oebbook(htmlpath, basedir, opts, log, mi) oeb = htmlinput.create_oebbook(htmlpath, basedir, opts, log, mi)
return oeb return oeb

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

@ -37,6 +37,7 @@ class HTMLInput(InputFormatPlugin):
description = _('Convert HTML and OPF files to an OEB') description = _('Convert HTML and OPF files to an OEB')
file_types = {'opf', 'html', 'htm', 'xhtml', 'xhtm', 'shtm', 'shtml'} file_types = {'opf', 'html', 'htm', 'xhtml', 'xhtm', 'shtm', 'shtml'}
commit_name = 'html_input' commit_name = 'html_input'
root_dir_for_absolute_links = ''
options = { options = {
OptionRecommendation(name='breadth_first', OptionRecommendation(name='breadth_first',
@ -253,6 +254,9 @@ class HTMLInput(InputFormatPlugin):
except: except:
self.log.warn('Failed to decode link %r. Ignoring'%link_) self.log.warn('Failed to decode link %r. Ignoring'%link_)
return None, None return None, None
if self.root_dir_for_absolute_links and link_.startswith('/'):
link_ = link_.lstrip('/')
base = self.root_dir_for_absolute_links
try: try:
l = Link(link_, base if base else os.getcwd()) l = Link(link_, base if base else os.getcwd())
except: except: