mirror of
https://github.com/Abdess/retroarch_system.git
synced 2026-11-16 14:47:49 -06:00
fix: platform entries skip other emulators' trees
A platform entry names no profile, so bios/Other/<emulator>/ was never foreign to it. EmuELEC's ports/VVVVVV/data.zip resolved to xrick's data.zip, then to xrick's data directory copy. A system that lists its cores now takes no name match only another emulator's tree answers.
This commit is contained in:
1 parent
35ad19ff02
commit
402e688b01
4 files changed
+122
-20
No files matched your search
+32
-1
@@ -424,11 +424,24 @@ def load_platform_config(platform_name: str, platforms_dir: str = "platforms") -
|
||||
|
||||
# Each entry carries the system that declares it: a hashless name match is
|
||||
# narrowed to the maker folder that system names (resolve_local_file).
|
||||
# A system that names its own cores (EmuELEC, AmberELEC, KNULLI) also
|
||||
# passes them on, so another emulator's tree is foreign to its entries.
|
||||
# Fresh dicts, since a YAML anchor can share one entry between systems.
|
||||
config["systems"] = {
|
||||
sys_id: {
|
||||
**system,
|
||||
"files": [{**f, "platform_system": sys_id} for f in system["files"]],
|
||||
"files": [
|
||||
{
|
||||
**f,
|
||||
"platform_system": sys_id,
|
||||
**(
|
||||
{"platform_cores": list(system["cores"])}
|
||||
if system.get("cores")
|
||||
else {}
|
||||
),
|
||||
}
|
||||
for f in system["files"]
|
||||
],
|
||||
}
|
||||
if isinstance(system, dict) and system.get("files")
|
||||
else system
|
||||
@@ -1735,6 +1748,24 @@ def resolve_local_file(
|
||||
continue
|
||||
if os.path.exists(path) and path not in candidates:
|
||||
candidates.append(path)
|
||||
# A platform entry names no profile, but a system that lists its
|
||||
# cores says whose files it asks for. A name only another emulator's
|
||||
# tree answers is no evidence, and the data directories hold those
|
||||
# emulators' trees too: EmuELEC's VVVVVV data.zip was served xrick's
|
||||
# archive of the same name, then xrick's data directory copy.
|
||||
core_owners = {
|
||||
token
|
||||
for core in file_entry.get("platform_cores") or ()
|
||||
for token in _affinity_tokens(str(core))
|
||||
}
|
||||
if (
|
||||
not owners
|
||||
and core_owners
|
||||
and candidates
|
||||
and all(_foreign_tree(p, core_owners) for p in candidates)
|
||||
):
|
||||
candidates = []
|
||||
unsourceable = True
|
||||
if makers and candidates:
|
||||
candidates = [p for p in candidates if not other_maker(p, makers, db)]
|
||||
if not candidates:
|
||||
|
||||
@@ -1035,13 +1035,18 @@ def _split_contract(config: dict) -> tuple[dict, dict]:
|
||||
"""
|
||||
allowed = _contract_keys()
|
||||
contract = {key: value for key, value in config.items() if key in allowed}
|
||||
# platform_system is the resolver's copy of the key each entry sits under.
|
||||
# platform_system and platform_cores are the resolver's copies of the key
|
||||
# each entry sits under and of that system's cores.
|
||||
if isinstance(contract.get("systems"), dict):
|
||||
contract["systems"] = {
|
||||
sys_id: {
|
||||
**system,
|
||||
"files": [
|
||||
{k: v for k, v in f.items() if k != "platform_system"}
|
||||
{
|
||||
k: v
|
||||
for k, v in f.items()
|
||||
if k not in ("platform_system", "platform_cores")
|
||||
}
|
||||
for f in system["files"]
|
||||
],
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user