Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-31 14:33:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

LRF Input: Fix a regression that broke parsing LRF files. Fixes #1826970 [lrf format is not supported in any way](https://bugs.launchpad.net/calibre/+bug/1826970)

Browse Source
This commit is contained in:
Kovid Goyal 2019-04-30 08:48:13 +05:30
parent a2fa719545
commit bc7b5b05a7
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/calibre/ebooks/lrf/meta.py
View File

@ -18,6 +18,7 @@ from shutil import copyfileobj
import xml.dom.minidom as dom import xml.dom.minidom as dom
from functools import wraps from functools import wraps
from calibre.ebooks.chardet import xml_to_unicode
from calibre.ebooks.metadata import MetaInformation, string_to_authors from calibre.ebooks.metadata import MetaInformation, string_to_authors
from polyglot.builtins import unicode_type from polyglot.builtins import unicode_type
@ -394,14 +395,9 @@ class LRFMetaFile(object):
if len(src) != self.uncompressed_info_size: if len(src) != self.uncompressed_info_size:
raise LRFException("Decompression of document meta info\ raise LRFException("Decompression of document meta info\
yielded unexpected results") yielded unexpected results")
try:
src = xml_to_unicode(src, strip_encoding_pats=True, resolve_entities=True, assume_utf8=True)[0]
return dom.parseString(src) return dom.parseString(src)
except:
try:
return dom.parseString(src.replace('\x00', '').strip())
except:
src = src.replace('\x00', '').strip().decode('latin1')
return dom.parseString(src.encode('utf-8'))
except zlib.error: except zlib.error:
raise LRFException("Unable to decompress document meta information") raise LRFException("Unable to decompress document meta information")