fix: join platform system names to profiles

The rom folder survey joined 463 folders to their default core's whole
profile, no system of it matching. SYSTEM_ALIASES, the one table
_norm_system_id reads, now folds ten more spellings of one machine:
apple2gs, astrocade, astrocde, creativision, gamepocketcomputer,
nintendo-super-game-boy, cps1, cps2, cps3 and pgm. The profiles that
used them take the canonical id (mame, groovymame, mamemess, mame0258,
mame0278, bsnes, mesen-s, mesence, jollycv, fbalpha2012 and its three
CPS cores, fbneo_cps12), as test_system_ids requires.

With bsnes and bsnes-hd now filing SGB1.sfc under one system, their
claims fold onto one report entry. _names_content read only the first
claim, hashless, and nSide's SGB1.sfc/ tree took the path before the
file. A hash on any folded claim now counts: every pack keeps the
destinations it had.

The site drops the eight display names the canonical ids replace and
names tvgames. README counts 533 systems instead of 541.

scripts/common.py

@@ -2663,6 +2663,20 @@ SYSTEM_ALIASES: dict[str, str] = {
     # profiles use only through these.
     "sega-segacd": "sega-megacd",
     "nes-fds": "nintendo-fds",
+    # One machine, two spellings across platform folders and profiles:
+    # Recalbox's apple2gs, Batocera's astrocade, KNULLI and RetroBat's
+    # astrocde, MiSTer's creativision, Batocera's gamepocketcomputer
+    # folder, BizHawk's Super Game Boy, the FBA 2012 board names.
+    "apple2gs": "apple-iigs",
+    "astrocade": "bally-astrocade",
+    "astrocde": "bally-astrocade",
+    "creativision": "crvision",
+    "gamepocketcomputer": "gamepock",
+    "nintendo-super-game-boy": "nintendo-sgb",
+    "cps1": "capcom-cps1",
+    "cps2": "capcom-cps2",
+    "cps3": "capcom-cps3",
+    "pgm": "igs-pgm",
 }
 
 

scripts/packextras.py

@@ -1377,8 +1377,17 @@ class _ClaimRanks:
 
 
 def _names_content(entry: dict) -> bool:
-    """Whether a report entry declares the bytes it wants, not only a name."""
-    return any(entry.get(field) for field in ("sha1", "md5", "sha256", "crc32"))
+    """Whether a report entry declares the bytes it wants, not only a name.
+
+    The claims folded onto the entry count: bsnes asks for SGB1.sfc by name
+    and bsnes-hd pins its md5 under the same system, and the entry carrying
+    both went after nSide's SGB1.sfc/ tree, which took the path from the file.
+    """
+    return any(
+        claim.get(field)
+        for claim in (entry, *entry.get("other_claims", []))
+        for field in ("sha1", "md5", "sha256", "crc32")
+    )
 
 
 def _save_fields(extra: dict, pack_path: str, placement: ExtraPlacement) -> None:

scripts/siterender.py

@@ -860,7 +860,6 @@ SYSTEM_NAMES: dict[str, str] = {
     "apple-iie": "Apple IIe",
     "apple-ios": "Apple iOS",
     "apple2": "Apple II",
-    "apple2gs": "Apple IIGS",
     "arcade": "Arcade games",
     "arcade-laserdisc": "Laserdisc arcade games",
     "arcadia-systems": "Arcadia Systems Multi Select",
@@ -869,7 +868,6 @@ SYSTEM_NAMES: dict[str, str] = {
     "aristocrat-mk6": "Aristocrat MK6",
     "aristocrat-mk7": "Aristocrat MK7",
     "arm": "ARM",
-    "astrocde": "Bally Astrocade",
     "atari-falcon": "Atari Falcon",
     "atari-jaguarcd": "Atari Jaguar CD",
     "atari-ste": "Atari STE",
@@ -920,10 +918,6 @@ SYSTEM_NAMES: dict[str, str] = {
     "commodore-cdtv": "Commodore CDTV",
     "commodore-cubo": "CD Express Cubo CD32",
     "coolbar": "Coolbar feature phones",
-    "cps1": "Capcom CPS-1",
-    "cps2": "Capcom CPS-2",
-    "cps3": "Capcom CPS-3",
-    "crvision": "VTech CreatiVision",
     "cstrike": "Counter-Strike",
     "ctf": "Quake II: Capture the Flag",
     "czero": "Counter-Strike: Condition Zero",
@@ -1073,7 +1067,6 @@ SYSTEM_NAMES: dict[str, str] = {
     "nintendo-nss": "Nintendo Super System",
     "nintendo-playch10": "Nintendo PlayChoice-10",
     "nintendo-sfcbox": "Nintendo Super Famicom Box",
-    "nintendo-sgb": "Nintendo Super Game Boy",
     "nintendo-virtualboy": "Nintendo Virtual Boy",
     "nintendo-wii-arcade": "Nintendo Wii arcade boards",
     "nmk16": "NMK16",
@@ -1092,7 +1085,6 @@ SYSTEM_NAMES: dict[str, str] = {
     "pce-tourvision": "TourVision",
     "pdark": "Perfect Dark",
     "pegasus": "Aamber Pegasus",
-    "pgm": "IGS PolyGame Master",
     "philips-p2000t": "Philips P2000T",
     "philips-vg5k": "Philips VG 5000",
     "picocomputer-6502": "Picocomputer 6502 programs",
@@ -1216,6 +1208,7 @@ SYSTEM_NAMES: dict[str, str] = {
     "tomb-raider-1": "Tomb Raider",
     "tomb-raider-2": "Tomb Raider II",
     "transport-tycoon-deluxe": "Transport Tycoon Deluxe",
+    "tvgames": "Plug-and-play TV games",
     "tyrian": "Tyrian",
     "ur-quan-masters": "Star Control II",
     "urban-terror": "Urban Terror",