Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-08-30 23:00:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

zipfile: Fix regression that broke handling of zipfiles with internal filenames not encoded in UTF-8. Fixes #1860889 [Decoding fails when opening a file with a specific file name in the viewer](https://bugs.launchpad.net/calibre/+bug/1860889)

Browse Source
This commit is contained in:
Kovid Goyal 2020-01-26 08:38:49 +05:30
parent 547fa085c0
commit 197a744aac
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/calibre/utils/zipfile.py
View File

@ -11,7 +11,7 @@ from tempfile import SpooledTemporaryFile
from calibre import sanitize_file_name
from calibre.constants import filesystem_encoding
from calibre.ebooks.chardet import detect
from polyglot.builtins import unicode_type, string_or_bytes, getcwd, map
from polyglot.builtins import unicode_type, string_or_bytes, getcwd, map, as_bytes
try:
import zlib # We may need its compression method
@ -327,8 +327,12 @@ class ZipInfo (object):
# This is used to ensure paths in generated ZIP files always use
# forward slashes as the directory separator, as required by the
# ZIP format specification.
if os.sep != "/" and os.sep in filename:
filename = filename.replace(os.sep, "/")
if os.sep != '/':
os_sep, sep = os.sep, '/'
if isinstance(filename, bytes):
os_sep, sep = as_bytes(os_sep), b'/'
if os_sep in filename:
filename = filename.replace(os_sep, sep)
self.filename = filename # Normalized file name
self.date_time = date_time # year, month, day, hour, min, sec