kmoody/libretro
1
0
Fork 0
mirror of https://github.com/Abdess/retroarch_system.git synced 2026-04-13 12:22:33 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: verify functions handle flat zip extraction

Browse Source
This commit is contained in:
Abdessamad Derraz
2026-04-03 11:50:26 +02:00
parent 6fc2753f3e
commit 9ba8b02ff1
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/generate_pack.py
View File

@@ -2432,6 +2432,11 @@ def _run_verify_packs(args):
with zipfile.ZipFile(zip_path) as zf: with zipfile.ZipFile(zip_path) as zf:
zf.extractall(extract_dir) zf.extractall(extract_dir)
# Auto-detect flat vs nested extraction
is_flat = bool(base_dest) and not os.path.isdir(
os.path.join(extract_dir, base_dest)
)
missing = [] missing = []
hash_fail = [] hash_fail = []
ok = 0 ok = 0
@@ -2442,7 +2447,7 @@ def _run_verify_packs(args):
continue continue
fp = ( fp = (
os.path.join(extract_dir, base_dest, dest) os.path.join(extract_dir, base_dest, dest)
if base_dest if base_dest and not is_flat
else os.path.join(extract_dir, dest) else os.path.join(extract_dir, dest)
) )
# Case-insensitive fallback # Case-insensitive fallback

9
tests/test_e2e.py
View File

@@ -3383,10 +3383,17 @@ class TestE2E(unittest.TestCase):
registry_path, registry_path,
emulators_dir=self.emulators_dir, emulators_dir=self.emulators_dir,
) )
# Detect flat vs nested ZIP to build expected paths
base = manifest.get("base_destination", "") base = manifest.get("base_destination", "")
is_flat = bool(base) and not any(
n.startswith(base + "/") for n in zip_names
)
manifest_dests = set() manifest_dests = set()
for f in manifest["files"]: for f in manifest["files"]:
d = f"{base}/{f['dest']}" if base else f["dest"] if base and not is_flat:
d = f"{base}/{f['dest']}"
else:
d = f["dest"]
manifest_dests.add(d) manifest_dests.add(d)
self.assertEqual(manifest_dests, zip_names) self.assertEqual(manifest_dests, zip_names)