From e17d77171051e541a3d2f55e341376a00cb586f8 Mon Sep 17 00:00:00 2001
From: Abdessamad Derraz <3028866+Abdess@users.noreply.github.com>
Date: Thu, 26 Mar 2026 08:42:08 +0100
Subject: [PATCH] feat: add target_cores filter to resolve_platform_cores

Optional target_cores parameter intersects the resolved core set,
enabling per-target filtering without changing existing call sites.
Includes 2 E2E tests covering intersection and None pass-through.
---
 scripts/common.py | 34 ++++++++++++++++++----------------
 tests/test_e2e.py | 27 +++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 16 deletions(-)

diff --git a/scripts/common.py b/scripts/common.py
index 39385d36..3f65bfa1 100644
--- a/scripts/common.py
+++ b/scripts/common.py
@@ -582,29 +582,28 @@ def group_identical_platforms(
 
 def resolve_platform_cores(
     config: dict, profiles: dict[str, dict],
+    target_cores: set[str] | None = None,
 ) -> set[str]:
     """Resolve which emulator profiles are relevant for a platform.
 
     Resolution strategies (by priority):
-    1. cores: "all_libretro" — all profiles with libretro in type
-    2. cores: [list] — profiles whose dict key matches a core name
-    3. cores: absent — fallback to systems intersection
+    1. cores: "all_libretro" -- all profiles with libretro in type
+    2. cores: [list] -- profiles whose dict key matches a core name
+    3. cores: absent -- fallback to systems intersection
 
     Alias profiles are always excluded (they point to another profile).
+    If target_cores is provided, result is intersected with it.
     """
     cores_config = config.get("cores")
 
     if cores_config == "all_libretro":
-        return {
+        result = {
             name for name, p in profiles.items()
             if "libretro" in p.get("type", "")
             and p.get("type") != "alias"
         }
-
-    if isinstance(cores_config, list):
+    elif isinstance(cores_config, list):
         core_set = {str(c) for c in cores_config}
-        # Build reverse index: platform core name -> profile name
-        # Uses profile filename (dict key) + all names in cores: field
         core_to_profile: dict[str, str] = {}
         for name, p in profiles.items():
             if p.get("type") == "alias":
@@ -612,19 +611,22 @@ def resolve_platform_cores(
             core_to_profile[name] = name
             for core_name in p.get("cores", []):
                 core_to_profile[str(core_name)] = name
-        return {
+        result = {
             core_to_profile[c]
             for c in core_set
             if c in core_to_profile
         }
+    else:
+        platform_systems = set(config.get("systems", {}).keys())
+        result = {
+            name for name, p in profiles.items()
+            if set(p.get("systems", [])) & platform_systems
+            and p.get("type") != "alias"
+        }
 
-    # Fallback: system ID intersection
-    platform_systems = set(config.get("systems", {}).keys())
-    return {
-        name for name, p in profiles.items()
-        if set(p.get("systems", [])) & platform_systems
-        and p.get("type") != "alias"
-    }
+    if target_cores is not None:
+        result = result & target_cores
+    return result
 
 
 def _parse_validation(validation: list | dict | None) -> list[str]:
diff --git a/tests/test_e2e.py b/tests/test_e2e.py
index fb60cb74..7d9eddb1 100644
--- a/tests/test_e2e.py
+++ b/tests/test_e2e.py
@@ -1291,6 +1291,33 @@ class TestE2E(unittest.TestCase):
             child,
         )
 
+    # ---------------------------------------------------------------
+    # Target filtering in resolve_platform_cores (Task 2)
+    # ---------------------------------------------------------------
+
+    def test_target_core_intersection(self):
+        self._write_target_fixtures()
+        profiles = {
+            "core_a": {"type": "libretro", "systems": ["sys1"]},
+            "core_b": {"type": "libretro", "systems": ["sys1"]},
+            "core_c": {"type": "libretro", "systems": ["sys2"]},
+            "core_d": {"type": "libretro", "systems": ["sys2"]},
+        }
+        config = {"cores": "all_libretro"}
+        result = resolve_platform_cores(config, profiles)
+        self.assertEqual(result, {"core_a", "core_b", "core_c", "core_d"})
+        result = resolve_platform_cores(config, profiles, target_cores={"core_a", "core_b"})
+        self.assertEqual(result, {"core_a", "core_b"})
+
+    def test_target_none_no_filter(self):
+        profiles = {
+            "core_a": {"type": "libretro", "systems": ["sys1"]},
+            "core_b": {"type": "libretro", "systems": ["sys1"]},
+        }
+        config = {"cores": "all_libretro"}
+        result = resolve_platform_cores(config, profiles, target_cores=None)
+        self.assertEqual(result, {"core_a", "core_b"})
+
 
 if __name__ == "__main__":
     unittest.main()