mirror of
https://github.com/Abdess/retroarch_system.git
synced 2026-11-17 07:07:52 -06:00
feat: give each set its requirement and one pick
Three changes to the search-list model, one commit because the readers
and the profiles must move together for the schema to hold.
Set requirement in a groups map. pom2 falls back on apple2.rom for the
][ and the ][+, and on apple2e.rom for the //e it boots and for the
unenhanced //e: one required on the file could not say both. A profile
now declares groups: {name: {required}}, a member writes no required
of its own (schema and validate_schemas refuse one) and load_emulator_
profiles derives it, true when one of its sets is. group takes a name,
a list, or a map from set to rank where the rank differs per set. pom2
is grouped from SystemProfile.cpp and MainWindow.cpp:246-296 at its pin.
One member per required set under --required-only. The pick is the
first the code reads among the held members the region filter leaves,
by rank then declaration order; a set the platform declares a member
of is carried by that declaration. The emulator pack, verify
--emulator, the platform pack, its manifest and verify --platform read
alternatives.required_only_spares or core_file_spares.
variant_group is now selection_slot: files a core chooses between by
a rule other than first found (disc territory for PicoDrive and
Pizza Boy SC, the o2em_bios option, a WebAssembly probe in SWF
Player). Where the code takes any one, the field became a group:
ARMSX1 (ArmSxBackend.java:149-157, name order), ePSXe (load_bios
0x433540-0x433621 of the 2.0.5 Linux x64 binary, one configured path,
HLE when BiosHLE is set), FPse and FPse-NG, DXX-Rebirth's HOGs
(inferno.cpp:472-512). odin and zesarux carried it with no effect.
slot.py compares ranks only between candidates that share a set.
This commit is contained in:
1 parent
1e12d9fe38
commit
315dab82b7
38 files changed
+661
-432
No files matched your search
+19
-13
@@ -124,27 +124,33 @@ def _systems_outside_profile(path: Path, document: object) -> list[str]:
|
||||
|
||||
|
||||
def _group_requirement_split(path: Path, document: object) -> list[str]:
|
||||
"""A group whose members disagree on required.
|
||||
"""A set named by a member and not declared, declared and never used,
|
||||
or a member that writes a required of its own.
|
||||
|
||||
The members of a group are one need, so required states the set's and
|
||||
reads the same on each. A true on the first name only wrote the search
|
||||
order into required, and the other names read as optional files.
|
||||
The requirement belongs to the set, in the profile's groups map, and a
|
||||
member's is derived from it. A value on the member is a second source
|
||||
that can contradict the first: a true on the first name only wrote the
|
||||
search order into required, and the other names read as optional.
|
||||
"""
|
||||
from alternatives import groups_of
|
||||
|
||||
if not isinstance(document, dict):
|
||||
return []
|
||||
seen: dict[str, set[bool]] = {}
|
||||
for entry in document.get("files") or []:
|
||||
label = path.relative_to(ROOT)
|
||||
declared = set((document.get("groups") or {}).keys())
|
||||
used: set[str] = set()
|
||||
out: list[str] = []
|
||||
for index, entry in enumerate(document.get("files") or []):
|
||||
if not isinstance(entry, dict):
|
||||
continue
|
||||
for group in groups_of(entry):
|
||||
seen.setdefault(group, set()).add(bool(entry.get("required", True)))
|
||||
return [
|
||||
f"{path.relative_to(ROOT)}: group {group} mixes required true and false"
|
||||
for group, values in sorted(seen.items())
|
||||
if len(values) > 1
|
||||
]
|
||||
names = groups_of(entry)
|
||||
used.update(names)
|
||||
if names and "required" in entry:
|
||||
out.append(f"{label}: files[{index}] ({entry.get('name')}) is in a group "
|
||||
"and writes required: the set's requirement is in groups")
|
||||
out.extend(f"{label}: group {g} has no entry in groups" for g in sorted(used - declared))
|
||||
out.extend(f"{label}: groups declares {g}, which no entry names" for g in sorted(declared - used))
|
||||
return out
|
||||
|
||||
|
||||
def _checks_without_values(path: Path, document: object) -> list[str]:
|
||||
|
||||
Reference in new issue
Block a user