Introduce _move_entry_data and rework chunk_size passing

danny0838 · danny0838 · commit 1b7d75a4ea4e · 2025-05-25T10:09:41.000+08:00
diff --git a/Lib/zipfile/__init__.py b/Lib/zipfile/__init__.py
@@ -1369,8 +1369,9 @@ def close(self):
 
 class _ZipRepacker:
     """Class for ZipFile repacking."""
-    def __init__(self, debug=0):
+    def __init__(self, *, chunk_size=2**20, debug=0):
         self.debug = debug  # Level of printing: 0 through 3
+        self.chunk_size = chunk_size
 
     def _debug(self, level, *msg):
         if self.debug >= level:
@@ -1443,7 +1444,7 @@ def repack(self, zfile):
         with zfile._lock:
             self._repack(zfile)
 
-    def _repack(self, zfile, *, chunk_size=2**20):
+    def _repack(self, zfile):
         fp = zfile.fp
 
         # get a sorted filelist by header offset, in case the dir order
@@ -1473,14 +1474,7 @@ def _repack(self, zfile, *, chunk_size=2**20):
             if entry_offset > 0:
                 old_header_offset = info.header_offset
                 info.header_offset -= entry_offset
-                read_size = 0
-                while read_size < used_entry_size:
-                    fp.seek(old_header_offset + read_size)
-                    data = fp.read(min(used_entry_size - read_size, chunk_size))
-                    fp.seek(info.header_offset + read_size)
-                    fp.write(data)
-                    fp.flush()
-                    read_size += len(data)
+                self._move_entry_data(fp, old_header_offset, info.header_offset, used_entry_size)
 
             if info._end_offset is not None:
                 info._end_offset = info.header_offset + used_entry_size
@@ -1700,6 +1694,16 @@ def _calc_local_file_entry_size(self, fp, zinfo):
             dd_size
         )
 
+    def _move_entry_data(self, fp, old_offset, new_offset, size):
+        read_size = 0
+        while read_size < size:
+            fp.seek(old_offset + read_size)
+            data = fp.read(min(size - read_size, self.chunk_size))
+            fp.seek(new_offset + read_size)
+            fp.write(data)
+            fp.flush()
+            read_size += len(data)
+
 
 class ZipFile:
     """ Class with methods to open, read, write, close, list zip files.
