ref: separate out _get_metadata_bytes

Author: joshuarli

make_index.py

@@ -25,14 +25,7 @@ def _commit_info() -> tuple[str, int]:
     return h, int(t)
 
 
-def _make_info(filename: str) -> dict[str, Any]:
-    h, t = _commit_info()
-
-    with open(filename, "rb") as f:
-        sha256 = hashlib.sha256(f.read()).hexdigest()
-
-    metadata_bytes = b""
-
+def _get_metadata_bytes(filename: str) -> bytes:
     with zipfile.ZipFile(filename) as zipf:
         (metadata,) = (
             name
@@ -41,19 +34,29 @@ def _make_info(filename: str) -> dict[str, Any]:
         )
         with zipf.open(metadata) as f:
             metadata_bytes = f.read()
-            metadata_sha256 = hashlib.sha256(metadata_bytes).hexdigest()
-            info = email.message_from_bytes(metadata_bytes)
+            return metadata_bytes
+
+
+def _make_info(filename: str) -> dict[str, Any]:
+    h, t = _commit_info()
+
+    with open(filename, "rb") as f:
+        sha256 = hashlib.sha256(f.read()).hexdigest()
+
+    metadata_bytes = _get_metadata_bytes(filename)
+    metadata_sha256 = hashlib.sha256(metadata_bytes).hexdigest()
+    info = email.message_from_bytes(metadata_bytes)
 
     dist_info = {
         "requires_dist": info.get_all("requires-dist"),
         "requires_python": info.get("requires-python"),
     }
 
+    # this is intended to be exactly the structure dumb-pypi generates
     return {
         "filename": os.path.basename(filename),
         "hash": f"sha256={sha256}",
         "core_metadata": f"sha256={metadata_sha256}",
-        "_metadata": metadata_bytes,
         "upload_timestamp": t,
         "uploaded_by": f"git@{h}",
         **{k: v for k, v in dist_info.items() if v},
@@ -99,13 +102,11 @@ def main(argv: Sequence[str] | None = None) -> int:
         seen.add(basename)
         package_info = _make_info(filename)
 
-        metadata_data = package_info.pop("_metadata")
-
         new_packages.append(package_info)
         shutil.copy(filename, wheels_dir)
 
         with open(f"{wheels_dir}/{basename}.metadata", "wb") as f:
-            f.write(metadata_data)
+            f.write(_get_metadata_bytes(filename))
 
     with tempfile.TemporaryDirectory() as tmpdir:
         prev_json = os.path.join(tmpdir, "previous.json")