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 #1924703 [E-book viewer: another error opening a *.chm file](https://bugs.launchpad.net/calibre/+bug/1924703)

Browse Source
This commit is contained in:
Kovid Goyal 2021-04-17 07:13:45 +05:30
parent 8c30eba87c
commit 7a5d8b2632
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,7 +44,14 @@ class CHMReader(CHMFile):
def __init__(self, input, log, input_encoding=None): def __init__(self, input, log, input_encoding=None):
CHMFile.__init__(self) CHMFile.__init__(self)
if isinstance(input, unicode_type): if isinstance(input, unicode_type):
input = input.encode(filesystem_encoding) enc = 'mbcs' if iswindows else filesystem_encoding
try:
input = input.encode(enc)
except UnicodeEncodeError:
from calibre.ptempfile import PersistentTemporaryFile
with PersistentTemporaryFile(suffix='.chm') as t:
t.write(open(input, 'rb').read())
input = t.name
if not self.LoadCHM(input): if not self.LoadCHM(input):
raise CHMError("Unable to open CHM file '%s'"%(input,)) raise CHMError("Unable to open CHM file '%s'"%(input,))
self.log = log self.log = log
@ -122,7 +129,7 @@ class CHMReader(CHMFile):
path = '/' + path path = '/' + path
res, ui = self.ResolveObject(path) res, ui = self.ResolveObject(path)
if res != chmlib.CHM_RESOLVE_SUCCESS: if res != chmlib.CHM_RESOLVE_SUCCESS:
raise CHMError("Unable to locate '%s' within CHM file '%s'"%(path, self.filename)) raise CHMError(f"Unable to locate {path!r} within CHM file {self.filename!r}")
size, data = self.RetrieveObject(ui) size, data = self.RetrieveObject(ui)
if size == 0: if size == 0:
raise CHMError("'%s' is zero bytes in length!"%(path,)) raise CHMError("'%s' is zero bytes in length!"%(path,))