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

CHM Input: Handle files with deeply nested markup and non html files listed at the start of the manifest. Fixes #993607 (chm to mobi conversion crashes with "maximum recursion depth exceeded")

Browse Source
This commit is contained in:
Kovid Goyal 2012-05-03 17:56:20 +05:30
parent 226a26d208
commit 21c84615de
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/calibre/ebooks/chm/reader.py
View File

@ -155,7 +155,10 @@ class CHMReader(CHMFile):
self.hhc_path = f self.hhc_path = f
break break
if self.hhc_path not in files and files: if self.hhc_path not in files and files:
self.hhc_path = files[0] for f in files:
if f.partition('.')[-1].lower() in {'html', 'htm'}:
self.hhc_path = f
break
if self.hhc_path == '.hhc' and self.hhc_path not in files: if self.hhc_path == '.hhc' and self.hhc_path not in files:
from calibre import walk from calibre import walk
@ -241,7 +244,10 @@ class CHMReader(CHMFile):
except: except:
pass pass
# do not prettify, it would reformat the <pre> tags! # do not prettify, it would reformat the <pre> tags!
return str(soup) try:
return str(soup)
except RuntimeError:
return data
def Contents(self): def Contents(self):
if self._contents is not None: if self._contents is not None: