From 602493284602bcb8177b29374a96e04393ac0a03 Mon Sep 17 00:00:00 2001 From: Abdessamad Derraz <3028866+Abdess@users.noreply.github.com> Date: Mon, 9 Nov 2026 17:42:13 +0100 Subject: [PATCH] feat: read a launcher name with an added extension ROCKNIX's Amiberry configs pass kick34005.A500.rom and kick40068.A1200.rom, Amiberry's names for Kickstart 1.3 and 3.1 with .rom appended. Amiberry opens the path as given and boots AROS without it, so the pack now ships the held ROM under the launcher's name. --- scripts/cross_reference.py | 5 ++++- scripts/launchers.py | 19 +++++++++++++++++++ tests/test_launcher_gaps.py | 5 +++++ tests/test_launcher_layer.py | 18 +++++++++++++++++- 4 files changed, 45 insertions(+), 2 deletions(-) diff --git a/scripts/cross_reference.py b/scripts/cross_reference.py index ac1843322..a147f8309 100644 --- a/scripts/cross_reference.py +++ b/scripts/cross_reference.py @@ -50,7 +50,7 @@ from common import ( select_emulator_profiles, ) from hashing import parse_hash_list -from launchers import LauncherLayer, declared_destinations, held_record, set_by +from launchers import LauncherLayer, declared_destinations, held_record, set_by, suffixed_stem from launchers import _directories as launcher_directories from launchers import _names as launcher_names from validation import ( @@ -1116,8 +1116,11 @@ class _NameHolder: return self._cache[name] base = name.rsplit("/", 1)[-1] found: tuple[str, bool] | None = None + stem = suffixed_stem(base) if base in self.by_name or any(map(self._entry_held, self.exact.get(base, []))): found = (base, True) + elif stem is not None and any(map(self._entry_held, self.exact.get(stem, []))): + found = (base, True) else: path, _status = resolve_local_file( {"name": name}, self.db, data_dir_registry=self.registry diff --git a/scripts/launchers.py b/scripts/launchers.py index 2b2a2014b..26b8e1e2b 100644 --- a/scripts/launchers.py +++ b/scripts/launchers.py @@ -100,6 +100,18 @@ def setting_tokens(passes_to: str) -> set[str]: } - {""} +def suffixed_stem(name: str) -> str | None: + """The file name a launcher name carries before an extension it appended. + + ROCKNIX's Amiberry config passes kick34005.A500.rom, the name Amiberry + gives Kickstart 1.3 (amiberry_whdbooter.cpp:370) followed by ".rom". A + stem that is no file name itself (scph1001 of scph1001.bin) is none. + """ + base = name.rsplit("/", 1)[-1] + stem = base.rsplit(".", 1)[0] + return stem if "." in stem else None + + def set_by(entry: dict, passes_to: str) -> bool: """Whether a launcher hands its file to the setting a profile entry is read from.""" key = str(entry.get("config_key") or "") @@ -485,6 +497,13 @@ class LauncherLayer: # file under that name is the one the romfile4p slot reads. if set_by(entry, place.passes_to): return _Candidate(entry, basenames, False) + if place.kind == "fixed_name": + stems = { + base for base in basenames + if (stem := suffixed_stem(base)) is not None and place.fold(stem) in own + } + if stems: + return _Candidate(entry, stems, False) content = { place.fold(path.rsplit("/", 1)[-1]) for path in place.paths diff --git a/tests/test_launcher_gaps.py b/tests/test_launcher_gaps.py index 28528f710..d1947201a 100644 --- a/tests/test_launcher_gaps.py +++ b/tests/test_launcher_gaps.py @@ -73,6 +73,7 @@ LAUNCHERS = [ {"emulator": "pkgemu", "build": "standalone", "kind": "copies", "names": ["written.ini"], "source_ref": "pkg.sh:2"}, _record("setemu", "fixed_name", ["setname.bin"], passes_to="command line -romslot"), + _record("aliasemu", "fixed_name", ["alias.bin.rom"]), _record("caseemu", "fixed_name", ["mixed.rom"]), _record("foldemu", "fixed_name", ["MIXED.rom"], case_insensitive=True), _record("labelemu", "core_option", ["labelled.rom (CDZ)"]), @@ -186,6 +187,10 @@ class LauncherGapTest(unittest.TestCase): names = {name for _, name in self._rows()} self.assertFalse(names & {"shipped.bin", "written.ini"}) + def test_a_name_with_an_appended_extension_is_held(self) -> None: + """ROCKNIX's kick34005.A500.rom is Amiberry's kick34005.A500.""" + self.assertNotIn("alias.bin.rom", {name for _, name in self._rows()}) + def test_a_name_handed_to_a_held_entry_setting_is_held(self) -> None: self.assertNotIn("setname.bin", {name for _, name in self._rows()}) diff --git a/tests/test_launcher_layer.py b/tests/test_launcher_layer.py index ed06eeeb7..63ee14324 100644 --- a/tests/test_launcher_layer.py +++ b/tests/test_launcher_layer.py @@ -24,7 +24,7 @@ sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", "scripts")) import yaml # noqa: E402 from common import _emulator_profiles_cache, load_emulator_profiles, load_platform_config # noqa: E402 -from launchers import LauncherLayer, launcher_places # noqa: E402 +from launchers import LauncherLayer, launcher_places, suffixed_stem # noqa: E402 from verify import find_undeclared_files, verify_platform # noqa: E402 CONTENT = { @@ -273,6 +273,22 @@ class LauncherLayerTest(unittest.TestCase): self.assertEqual(added["launcher.rom"]["md5"], _md5(CONTENT["core.bin"])) self.assertIn("launcher.rom", self._pack_names()) + def test_a_fixed_name_with_an_appended_extension_takes_the_entry(self) -> None: + """ROCKNIX passes kick34005.A500.rom to Amiberry, which names + Kickstart 1.3 kick34005.A500: the pack shipped nothing under it.""" + profile = { + "emulator": "FixEmu", "type": "standalone", "systems": ["test-sys"], + "files": [{"name": "core.bin", "aliases": ["kick.A500"], "required": True}], + } + with open(os.path.join(self.emulators_dir, "fixemu.yml"), "w") as fh: + yaml.dump(profile, fh) + self.config["launchers"][2]["names"] = ["kick.A500.rom"] + _emulator_profiles_cache.clear() + self.profiles = load_emulator_profiles(self.emulators_dir) + added = {u["path"]: u for u in self._report() if u.get("launcher")} + self.assertEqual(added["kick.A500.rom"]["md5"], _md5(CONTENT["core.bin"])) + self.assertIsNone(suffixed_stem("scph1001.bin")) + def test_the_default_name_a_launcher_replaces_is_not_packed(self) -> None: """EmuDeck passes Complex_4627v1.03.bin to xemu, which then never opens Complex_4627.bin: the pack carried both, one read by nobody."""