fix: look inside every zipped_file archive

scripts/generate_pack.py

@@ -872,8 +872,12 @@ def generate_pack(
                             file_reasons[dedup_key] = "not found"
                         continue
 
-                if status == "hash_mismatch" and hash_mismatch_excludes_file(
-                    verification_mode
+                # Batocera hashes the member, never the ZIP: a zipped_file entry
+                # is checked inside the archive whatever the outer resolution
+                # said, as verify does. An archive without the member passed.
+                inner_checked = bool(file_entry.get("zipped_file") and local_path)
+                if hash_mismatch_excludes_file(verification_mode) and (
+                    status == "hash_mismatch" or inner_checked
                 ):
                     zf_name = file_entry.get("zipped_file")
                     if zf_name and local_path:

tests/test_zipped_member.py

@@ -0,0 +1,61 @@
+"""An archive pinned by the ROM inside it ships only if it holds that ROM.
+
+With no md5 on the entry, the pack never looked inside: trs80.zip without
+level1.rom went out as OK where verify said "not found inside ZIP".
+"""
+
+from __future__ import annotations
+
+import hashlib
+import sys
+import tempfile
+import unittest
+import zipfile
+from pathlib import Path
+
+import yaml
+
+REPO_ROOT = Path(__file__).resolve().parent.parent
+sys.path.insert(0, str(REPO_ROOT / "scripts"))
+
+from common import build_zip_contents_index  # noqa: E402
+from generate_pack import generate_pack  # noqa: E402
+
+
+class ZippedMemberIsChecked(unittest.TestCase):
+    def test_an_archive_without_the_member_is_not_shipped(self):
+        with tempfile.TemporaryDirectory(dir=REPO_ROOT / "tmp") as tmp:
+            root = Path(tmp)
+            (root / "platforms").mkdir()
+            archive = root / "bios" / "trs80.zip"
+            archive.parent.mkdir()
+            with zipfile.ZipFile(archive, "w") as zf:
+                zf.writestr("other.rom", b"x")
+            data = archive.read_bytes()
+            sha1 = hashlib.sha1(data).hexdigest()
+            db = {
+                "files": {sha1: {"name": "trs80.zip", "path": str(archive), "size": len(data),
+                                 "md5": hashlib.md5(data).hexdigest(), "sha1": sha1}},
+                "indexes": {"by_name": {"trs80.zip": [sha1]}, "by_md5": {}, "by_crc32": {},
+                            "by_path_suffix": {}},
+            }
+            (root / "platforms" / "_registry.yml").write_text(
+                yaml.dump({"platforms": {"plat": {"status": "active"}}})
+            )
+            (root / "platforms" / "plat.yml").write_text(yaml.dump({
+                "platform": "Plat", "verification_mode": "md5",
+                "systems": {"trs80": {"files": [
+                    {"name": "trs80.zip", "zipped_file": "level1.rom"},
+                ]}},
+            }))
+            pack = generate_pack(
+                "plat", str(root / "platforms"), db, str(root / "bios"), str(root / "dist"),
+                emulators_dir=str(root / "emulators"), zip_contents=build_zip_contents_index(db),
+                emu_profiles={}, offline=True,
+            )
+            names = zipfile.ZipFile(pack).namelist() if pack else []
+            self.assertNotIn("trs80.zip", names)
+
+
+if __name__ == "__main__":
+    unittest.main()