fix: keep only the system's entries in --system

A multi-system profile shipped every entry: the Lynx system pack carried 34 PlayStation, Saturn and Apple II files from mednafen. The entry's own system decides, as the platform pack and the installer already do.

scripts/common.py

@@ -1628,6 +1628,18 @@ def profiles_for_systems(
     return matching
 
 
+def entry_serves_systems(entry: dict, profile: dict, system_ids: list[str]) -> bool:
+    """Whether a profile entry belongs to one of the systems, spelled either way.
+
+    The entry's own `system:` decides; one without it serves every system
+    of its profile, the rule a platform pack applies to core extras.
+    """
+    own = entry.get("system")
+    systems = [own] if own else profile.get("systems", [])
+    wanted = {_norm_system_id(sid) for sid in system_ids}
+    return bool(wanted & {_norm_system_id(str(sid)) for sid in systems})
+
+
 def select_emulator_profiles(
     profile_names: list[str],
     all_profiles: dict,

scripts/generate_pack.py

@@ -62,6 +62,7 @@ from common import (
     MANUFACTURER_PREFIXES,
     require_yaml,
     ProfileSelectionError,
+    entry_serves_systems,
     sanitize_pack_path,
     select_emulator_profiles,
     system_core_reach,
@@ -1374,12 +1375,16 @@ def generate_emulator_pack(
     offline: bool | None = None,
     platforms_dir: str | None = None,
     pack_name: str | None = None,
+    system_ids: list[str] | None = None,
+    final_dir: str | None = None,
 ) -> str | None:
     """Generate a ZIP pack for specific emulator profiles.
 
     `pack_name` is the caller's own file name: the system pack names its
     archive after the system, and joining 23 SNES emulator names went past
-    the 255 bytes a file name may hold.
+    the 255 bytes a file name may hold. `system_ids` keeps only the entries
+    of those systems, as a platform pack narrows core extras. `final_dir`
+    is where the caller moves the archive, the path the report names.
     """
     all_profiles = load_emulator_profiles(emulators_dir, skip_aliases=False)
     if zip_contents is None:
@@ -1449,6 +1454,10 @@ def generate_emulator_pack(
                 db,
                 standalone,
             )
+            if system_ids:
+                files = [
+                    fe for fe in files if entry_serves_systems(fe, profile, system_ids)
+                ]
             if not files:
                 print(f"  No files needed for {profile.get('emulator', emu_name)}")
 
@@ -1694,7 +1703,6 @@ def generate_emulator_pack(
         os.unlink(zip_path)
 
     # Report
-    " + ".join(p.get("emulator", n) for n, p in selected)
     missing_count = len(missing_files)
     ok_count = total_files
     parts = [f"{ok_count} files packed"]
@@ -1706,7 +1714,8 @@ def generate_emulator_pack(
         parts.append(f"{len(unsourceable_files)} unsourceable")
     if instruction_files:
         parts.append(f"{len(instruction_files)} to provide")
-    print(f"  {zip_path}: {', '.join(parts)}")
+    shown = os.path.join(final_dir, zip_name) if final_dir else zip_path
+    print(f"  {shown}: {', '.join(parts)}")
     for name in missing_files:
         print(f"  MISSING: {name}")
     for name in unsourceable_files:
@@ -1801,6 +1810,8 @@ def generate_system_pack(
             offline=offline,
             platforms_dir=platforms_dir,
             pack_name=final_name,
+            system_ids=system_ids,
+            final_dir=output_dir,
         )
         if not result:
             return None

scripts/verify.py

@@ -69,6 +69,7 @@ from common import (
     platform_layouts,
     runs_standalone,
     standalone_set as platform_standalone_set,
+    entry_serves_systems,
     sanitize_pack_path,
     select_emulator_profiles,
 )
@@ -1547,11 +1548,13 @@ def verify_emulator(
     standalone: bool = False,
     regions: list[str] | None = None,
     platforms_dir: str = _REPO_PLATFORMS,
+    system_ids: list[str] | None = None,
 ) -> dict:
     """Verify files for specific emulator profiles.
 
     A region priority list narrows the report the same way a pack built with the
     same list would be narrowed, through the emulator pack's own drop set.
+    `system_ids` keeps the entries of those systems, as the system pack does.
     """
     from packpaths import (
         _archive_destination,
@@ -1625,6 +1628,8 @@ def verify_emulator(
             db,
             standalone,
         )
+        if system_ids:
+            files = [fe for fe in files if entry_serves_systems(fe, profile, system_ids)]
         if region_drops:
             # Loose files only, as the emulator pack: an archive ships whole,
             # and dropping kronos' regional stvbios.zip members rebuilt the
@@ -1996,7 +2001,8 @@ def verify_system(
         sys.exit(1)
 
     return verify_emulator(
-        matching, emulators_dir, db, standalone, regions=regions, platforms_dir=platforms_dir
+        matching, emulators_dir, db, standalone, regions=regions,
+        platforms_dir=platforms_dir, system_ids=system_ids,
     )