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

More py3 zipfile fixes

Browse Source
This commit is contained in:
Kovid Goyal 2019-12-13 09:42:17 +05:30
parent 76204c71d1
commit 7414cb28ba
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,6 +24,11 @@ __all__ = ["BadZipfile", "error", "ZIP_STORED", "ZIP_DEFLATED", "is_zipfile",
"ZipInfo", "ZipFile", "PyZipFile", "LargeZipFile"] "ZipInfo", "ZipFile", "PyZipFile", "LargeZipFile"]
def decode_zip_internal_file_name(fname, flags):
codec = 'utf-8' if flags & 0x800 else 'cp437'
return fname.decode(codec, 'replace')
class BadZipfile(Exception): class BadZipfile(Exception):
pass pass
@ -842,12 +847,7 @@ class ZipFile:
print(centdir) print(centdir)
filename = fp.read(centdir[_CD_FILENAME_LENGTH]) filename = fp.read(centdir[_CD_FILENAME_LENGTH])
flags = centdir[5] flags = centdir[5]
if flags & 0x800: filename = decode_zip_internal_file_name(filename, flags)
# UTF-8 file names extension
filename = filename.decode('utf-8')
else:
# Historical ZIP filename encoding
filename = filename.decode('cp437')
# Create ZipInfo instance to store file information # Create ZipInfo instance to store file information
x = ZipInfo(filename) x = ZipInfo(filename)
x.extra = fp.read(centdir[_CD_EXTRA_FIELD_LENGTH]) x.extra = fp.read(centdir[_CD_EXTRA_FIELD_LENGTH])
@ -890,6 +890,7 @@ class ZipFile:
fheader[_FH_FILENAME_LENGTH] + fheader[_FH_FILENAME_LENGTH] +
fheader[_FH_EXTRA_FIELD_LENGTH]) fheader[_FH_EXTRA_FIELD_LENGTH])
fname = self.fp.read(fheader[_FH_FILENAME_LENGTH]) fname = self.fp.read(fheader[_FH_FILENAME_LENGTH])
fname = decode_zip_internal_file_name(fname, zip_info.flag_bits)
if fname != zip_info.orig_filename: if fname != zip_info.orig_filename:
raise RuntimeError( raise RuntimeError(
'File name in directory "%s" and header "%s" differ.' % ( 'File name in directory "%s" and header "%s" differ.' % (
@ -1035,6 +1036,7 @@ class ZipFile:
fheader = struct.unpack(structFileHeader, fheader) fheader = struct.unpack(structFileHeader, fheader)
fname = zef_file.read(fheader[_FH_FILENAME_LENGTH]) fname = zef_file.read(fheader[_FH_FILENAME_LENGTH])
fname = decode_zip_internal_file_name(fname, zinfo.flag_bits)
if fheader[_FH_EXTRA_FIELD_LENGTH]: if fheader[_FH_EXTRA_FIELD_LENGTH]:
zef_file.read(fheader[_FH_EXTRA_FIELD_LENGTH]) zef_file.read(fheader[_FH_EXTRA_FIELD_LENGTH])