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

Fix #1060 (ePub conversion error)

Browse Source
This commit is contained in:
Kovid Goyal 2008-09-25 13:40:25 -07:00
parent 30fc423489
commit 0b8168258a
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/calibre/ebooks/epub/split.py
View File

@ -40,7 +40,7 @@ class Splitter(LoggingInterface):
self.setup_cli_handler(opts.verbose) self.setup_cli_handler(opts.verbose)
self.path = path self.path = path
self.always_remove = always_remove self.always_remove = always_remove
self.base = os.path.splitext(path)[0] + '_split_%d.html' self.base = (os.path.splitext(path)[0].replace('%', '%%') + '_split_%d.html')
self.opts = opts self.opts = opts
self.orig_size = os.stat(content(path)).st_size self.orig_size = os.stat(content(path)).st_size
self.log_info('\tSplitting %s (%d KB)', path, self.orig_size/1024.) self.log_info('\tSplitting %s (%d KB)', path, self.orig_size/1024.)
@ -341,7 +341,12 @@ def split(pathtoopf, opts):
html_files = [] html_files = []
for item in opf.itermanifest(): for item in opf.itermanifest():
if 'html' in item.get('media-type', '').lower(): if 'html' in item.get('media-type', '').lower():
html_files.append(item.get('href').split('/')[-1]) f = item.get('href').split('/')[-1]
f2 = f.replace('&', '%26')
if not os.path.exists(content(f)) and os.path.exists(content(f2)):
f = f2
item.set('href', item.get('href').replace('&', '%26'))
html_files.append(f)
changes = [] changes = []
for f in html_files: for f in html_files:
if os.stat(content(f)).st_size > opts.profile.flow_size: if os.stat(content(f)).st_size > opts.profile.flow_size:

7
src/calibre/ebooks/html.py
View File

@ -238,6 +238,13 @@ def opf_traverse(opf_reader, verbose=0, encoding=None):
path = os.path.abspath(item.path) path = os.path.abspath(item.path)
if path not in flat: if path not in flat:
flat.append(path) flat.append(path)
for i, path in enumerate(flat):
if not os.path.exists(path):
path = path.replace('&', '%26')
if os.path.exists(path):
flat[i] = path
for item in opf_reader.itermanifest():
item.set('href', item.get('href').replace('&', '%26'))
flat = [HTMLFile(path, 0, encoding, verbose) for path in flat] flat = [HTMLFile(path, 0, encoding, verbose) for path in flat]
return [f for f in flat if not f.is_binary] return [f for f in flat if not f.is_binary]