fix: hold the data dir lock in emulator packs

scripts/generate_pack.py

@@ -1219,6 +1219,38 @@ def _archive_is_optional(archive_entry: dict, archive_name: str, files: list[dic
     )
 
 
+def _pack_data_tree(
+    zf: zipfile.ZipFile,
+    local_cache: str,
+    dd_dest: str,
+    seen_destinations: set[str],
+    seen_parents: set[str],
+    seen_lower: set[str],
+) -> int:
+    """Write one data directory into an emulator pack, under its shared lock.
+
+    A refresh swaps the tree by rename; without the lock a walk half done
+    read the old tree and wrote files of the new one.
+    """
+    added = 0
+    with cache_lock(local_cache, shared=True):
+        for root, _dirs, filenames in os.walk(local_cache):
+            for fname in filenames:
+                src = os.path.join(root, fname)
+                rel = os.path.relpath(src, local_cache)
+                full = f"{dd_dest}/{rel}" if dd_dest else rel
+                if full.lower() in seen_lower or _has_path_conflict(
+                    full, seen_destinations, seen_parents
+                ):
+                    continue
+                seen_destinations.add(full)
+                _register_path(full, seen_destinations, seen_parents)
+                seen_lower.add(full.lower())
+                _add_pack_member(zf, src, full)
+                added += 1
+    return added
+
+
 def generate_emulator_pack(
     profile_names: list[str],
     emulators_dir: str,
@@ -1303,20 +1335,9 @@ def generate_emulator_pack(
                     prefix = pack_structure.get(mode_key, "")
                     if prefix:
                         dd_dest = f"{prefix}/{dd_dest}" if dd_dest else prefix
-                for root, _dirs, filenames in os.walk(local_cache):
+                total_files += _pack_data_tree(
-                    for fname in filenames:
+                    zf, local_cache, dd_dest, seen_destinations, seen_parents, seen_lower
-                        src = os.path.join(root, fname)
+                )
-                        rel = os.path.relpath(src, local_cache)
-                        full = f"{dd_dest}/{rel}" if dd_dest else rel
-                        if full.lower() in seen_lower:
-                            continue
-                        if _has_path_conflict(full, seen_destinations, seen_parents):
-                            continue
-                        seen_destinations.add(full)
-                        _register_path(full, seen_destinations, seen_parents)
-                        seen_lower.add(full.lower())
-                        _add_pack_member(zf, src, full)
-                        total_files += 1
 
             if not files:
                 print(f"  No files needed for {profile.get('emulator', emu_name)}")

tests/test_refresh_data_dirs.py

@@ -139,5 +139,32 @@ class PackWalkHoldsTheCache(unittest.TestCase):
                 fcntl.flock(handle, fcntl.LOCK_EX | fcntl.LOCK_NB)
                 fcntl.flock(handle, fcntl.LOCK_UN)
 
+class EmulatorPackHoldsTheCache(unittest.TestCase):
+    def test_the_walk_holds_a_shared_lock(self):
+        import fcntl  # noqa: PLC0415
+
+        from generate_pack import _pack_data_tree  # noqa: PLC0415
+
+        with tempfile.TemporaryDirectory(dir=REPO_ROOT / "tmp") as tmp:
+            cache = Path(tmp) / "data" / "scummvm"
+            cache.mkdir(parents=True)
+            (cache / "a.dat").write_bytes(b"a")
+            held: list[bool] = []
+
+            def member(_zf, _src, _dest):
+                with open(cache.with_name(".scummvm.lock"), "a") as handle:
+                    try:
+                        fcntl.flock(handle, fcntl.LOCK_EX | fcntl.LOCK_NB)
+                    except BlockingIOError:
+                        held.append(True)
+                    else:
+                        fcntl.flock(handle, fcntl.LOCK_UN)
+                        held.append(False)
+
+            with mock.patch("generate_pack._add_pack_member", member):
+                _pack_data_tree(None, str(cache), "scummvm", set(), set(), set())
+            self.assertEqual(held, [True])
+
+
 if __name__ == "__main__":
     unittest.main()