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

DRYer

Browse Source
This commit is contained in:
Kovid Goyal 2025-04-08 20:43:12 +05:30
parent 2d01ad73c6
commit 3e1a6e252e
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -511,6 +511,12 @@ class _ZipDecrypter:
self._UpdateKeys(c) self._UpdateKeys(c)
return c return c
def decrypt_bytes(self, raw: bytes) -> bytes:
ba = bytearray(raw)
for i, b in ba:
ba[i] = self(b)
return bytes(ba)
class ZipExtFile(io.BufferedIOBase): class ZipExtFile(io.BufferedIOBase):
'''File-like object for reading an archive member. '''File-like object for reading an archive member.
@ -671,7 +677,7 @@ class ZipExtFile(io.BufferedIOBase):
self._compress_left -= len(data) self._compress_left -= len(data)
if data and self._decrypter is not None: if data and self._decrypter is not None:
data = b''.join(bytes(bytearray(map(self._decrypter, bytearray(data))))) data = self._decrypter.decrypt_bytes(data)
if self._compress_type == ZIP_STORED: if self._compress_type == ZIP_STORED:
self._update_crc(data, eof=(self._compress_left==0)) self._update_crc(data, eof=(self._compress_left==0))
@ -720,7 +726,7 @@ class ZipExtFile(io.BufferedIOBase):
def decrypt_and_uncompress(self, raw: bytes) -> bytes: def decrypt_and_uncompress(self, raw: bytes) -> bytes:
if self._decrypter is not None and raw: if self._decrypter is not None and raw:
raw = b''.join(bytes(bytearray(map(self._decrypter, bytearray(raw))))) raw = self._decrypter.decrypt_bytes(raw)
if self._compress_type == ZIP_DEFLATED: if self._compress_type == ZIP_DEFLATED:
raw = zlib.decompress(raw, -15, max(self.uncompressed_size, zlib.DEF_BUF_SIZE)) raw = zlib.decompress(raw, -15, max(self.uncompressed_size, zlib.DEF_BUF_SIZE))
return raw return raw