From 852ce19ca9f6e0aa8a85b72ce8ba07075901f083 Mon Sep 17 00:00:00 2001
From: Abdessamad Derraz <3028866+Abdess@users.noreply.github.com>
Date: Wed, 11 Nov 2026 12:32:06 +0100
Subject: [PATCH] fix: read EmuDeck's MAME in ES-DE's rom folders

EmuDeck writes mame.ini rompath ${romsPath}/arcade;${biosPath};
${biosPath}/mame (emuDeckMAME.sh:66-68). Steam ROM Manager starts MAME
through tools/launchers/mame.sh with the game alone, so that list is
read there. Every standalone MAME command of ES-DE v3.5.0, which EmuDeck
installs, passes -rompath %GAMEDIR%\;%ROMPATH%/<system>, and the command
line outranks mame.ini. A set the mame.ini record places keeps that
place and also goes to each folder a command passes for a machine that
reads it.

The Model 3 folder, live in EmuDeck's list and commented out in
RetroDECK's, holds the machines of sega/model3.cpp.

Manifests: EmuDeck gains 1483 files (466.7 MB) below roms/, 480 each in
arcade, consolearcade and mame, the others in adam, daphne, laserdisc,
macintosh and 15 more. The pack ZIP does not change, roms/ being
written by the installer. No file leaves.
---
 scripts/common.py                | 27 ++++++++++++++++++++++-----
 tests/test_launcher_placement.py | 13 +++++++++++++
 2 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/scripts/common.py b/scripts/common.py
index 3c8510cf2..ffadda3c4 100644
--- a/scripts/common.py
+++ b/scripts/common.py
@@ -3487,6 +3487,7 @@ ANY_MACHINE_POPULATIONS: dict[str, tuple[str, tuple[str, ...]]] = {
     "cps2": ("source", ("capcom/cps2.cpp",)),
     "cps3": ("source", ("capcom/cps3.cpp",)),
     "model2": ("source", ("sega/model2.cpp",)),
+    "model3": ("source", ("sega/model3.cpp",)),
     "daphne": ("device_source", ("devices/machine/ld",)),
     "laserdisc": ("device_source", ("devices/machine/ld",)),
     "gameandwatch": ("source", ("handheld/",)),
@@ -3554,9 +3555,9 @@ def content_layout(
     goes to the folder of each system the platform launches the core for,
     and is named as read outside the BIOS folder where it knows none. An
     entry in the folder a passed ROM search path stands for (the root of a
-    standalone layout no launcher record places it in, a ``libretro_pools``
-    folder) goes to each folder a command passes for a machine that reads
-    it, a libretro one staying where it is too. Outside a platform (no
+    standalone layout, a ``libretro_pools`` folder) also goes to each folder
+    a command passes for a machine that reads it, and a standalone entry no
+    launcher record places goes there only. Outside a platform (no
     CONTENT_SCOPE_TAG) the view is left as it is.
     """
     tags = [t for t in standalone_cores if t.startswith(CONTENT_TAG_PREFIXES)]
@@ -3636,11 +3637,27 @@ def content_layout(
     if not searches or "" not in pools:
         return view
     for f in files:
-        layout = standalone_layout_path(f, view) if isinstance(f, dict) else None
-        if not layout or "/" in layout or f.get("unplaced") != OUTSIDE_BIOS_FOLDER:
+        layout = (
+            (f.get("layout_path") or standalone_layout_path(f, view)) if isinstance(f, dict) else None
+        )
+        if not layout or "/" in layout:
             out.append(f)
             continue
         reads = search_reads(layout)
+        if f.get("unplaced") != OUTSIDE_BIOS_FOLDER:
+            # A set a launcher record placed stays there: EmuDeck's
+            # mame.ini rompath is read when Steam ROM Manager starts MAME
+            # with no -rompath (tools/launchers/mame.sh), and ES-DE's
+            # commands read the folders they pass.
+            out.append(f)
+            held = {(f.get("root") or "", f.get("standalone_path") or "")}
+            extra = [
+                _placed_entry(f, view, (tree, f"{folder}/{layout}")) for tree, folder in reads
+            ]
+            extra = [e for e in extra if (e.get("root") or "", e["standalone_path"]) not in held]
+            changed |= bool(extra)
+            out.extend(extra)
+            continue
         if not reads:
             out.append(f)
             continue
diff --git a/tests/test_launcher_placement.py b/tests/test_launcher_placement.py
index 5bddd1974..7bc5aa33f 100644
--- a/tests/test_launcher_placement.py
+++ b/tests/test_launcher_placement.py
@@ -1174,6 +1174,19 @@ class LibretroMameOnEsdeRomPaths(unittest.TestCase):
             self.assertEqual(places, {("", "mame/bios/gamate.zip"), read}, platform)
 
 
+class StandaloneMameOnEmuDeck(unittest.TestCase):
+    """EmuDeck writes mame.ini rompath roms/arcade;bios;bios/mame
+    (emuDeckMAME.sh:66-68), read when Steam ROM Manager starts MAME with no
+    -rompath (tools/launchers/mame.sh). ES-DE's commands pass their own."""
+
+    def test_a_set_keeps_its_ini_place_and_gains_the_command_folder(self) -> None:
+        view = standalone_view("mame", "emudeck")
+        places = {(e.get("root") or "", e["standalone_path"]) for e in view["files"]
+                  if e["name"] == "adam.zip"}
+        self.assertIn(("", "adam.zip"), places)
+        self.assertIn(("roms", "adam/adam.zip"), places)
+
+
 class MacBootDisksOnKnulli(unittest.TestCase):
     def test_the_hard_records_bind(self) -> None:
         # mameGenerator.py and libretroMAMEConfig.py pass the boot disk as