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

Conversion pipeline: Respect UTF-8/32 BOM mark when decoding files in addition to UTF-16 BOM. Fixes #4025 (ebook convert chokes on a complex CSS file)

Browse Source
This commit is contained in:
Kovid Goyal 2009-11-15 19:37:14 -07:00
parent cb5107463f
commit e7620fb173
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/calibre/ebooks/oeb/base.py
View File

@ -1746,9 +1746,17 @@ class OEBBook(object):
return d.replace('\r\n', '\n').replace('\r', '\n') return d.replace('\r\n', '\n').replace('\r', '\n')
if isinstance(data, unicode): if isinstance(data, unicode):
return fix_data(data) return fix_data(data)
if data[:2] in ('\xff\xfe', '\xfe\xff'): bom_enc = None
if data[:4] in ('\0\0\xfe\xff', '\xff\xfe\0\0'):
bom_enc = {'\0\0\xfe\xff':'utf-32-be',
'\xff\xfe\0\0':'utf-32-le'}[data[:4]]
elif data[:2] in ('\xff\xfe', '\xfe\xff'):
bom_enc = {'\xff\xfe':'utf-16-le', '\xfe\xff':'utf-16-be'}[data[:2]]
elif data[:3] == '\xef\xbb\xbf':
bom_enc = 'utf-8'
if bom_enc is not None:
try: try:
return fix_data(data.decode('utf-16')) return fix_data(data.decode(bom_enc))
except UnicodeDecodeError: except UnicodeDecodeError:
pass pass
if self.input_encoding is not None: if self.input_encoding is not None: