mirror of
https://github.com/Abdess/retroarch_system.git
synced 2026-11-16 14:47:49 -06:00
refactor: read the roms root from romfolders
platforms/romfolders/<platform>.yml records the roms root from the OS's own source (roms_root path and from_bios), the same fact the registry's roms_directory restated for ROCKNIX alone. The manifest's roms_directory now carries from_bios, which the installer follows from a BIOS folder of the platform's name, and the registry key is gone. A list that installs above its BIOS folder (AmberELEC) holds its roms root in the install tree: a file a launcher runs from there is a plain dest. emulators_directory stays in the registry: no rom folders file names emulator folders.
This commit is contained in:
1 parent
8633db0a22
commit
3db2819150
12 files changed
+180
-52
No files matched your search
+14
-6
@@ -3687,10 +3687,17 @@ def _check_roms_directory(data: dict) -> None:
|
||||
return
|
||||
if (
|
||||
not isinstance(layout, dict)
|
||||
or set(layout) != {"bios_folder"}
|
||||
or set(layout) != {"bios_folder", "from_bios"}
|
||||
or len(_safe_relative_path(layout["bios_folder"], "roms_directory.bios_folder").parts) != 1
|
||||
or not isinstance(layout["from_bios"], str)
|
||||
):
|
||||
raise ValueError("invalid roms_directory")
|
||||
# The roms root relative to the BIOS folder: up some levels, then down
|
||||
# into named folders. Nothing climbs again once it went down.
|
||||
parts = PurePosixPath(layout["from_bios"]).parts
|
||||
ups = next((i for i, part in enumerate(parts) if part != ".."), len(parts))
|
||||
if not ups or any(part in ("..", ".", "/") or _CONTROLS.search(part) for part in parts[ups:]):
|
||||
raise ValueError("invalid roms_directory.from_bios")
|
||||
|
||||
|
||||
def _check_emulators_directory(data: dict) -> None:
|
||||
@@ -5294,17 +5301,18 @@ def place_roms_entries(
|
||||
) -> tuple[list[dict], list[dict]]:
|
||||
"""Find the roms folder for the entries a launcher reads below it.
|
||||
|
||||
The platform keeps its BIOS folder in its roms folder under the name the
|
||||
list gives (ROCKNIX's /storage/roms/bios): a BIOS folder of that name
|
||||
puts the roms folder above it. Any other is a folder this run cannot
|
||||
relate to the roms, and the entries are left out with the reason.
|
||||
The list gives the roms root relative to the BIOS folder, as the OS's
|
||||
own source places them (ROCKNIX's /storage/roms holds bios/): a BIOS
|
||||
folder of the platform's name puts the roms root there. Any other is a
|
||||
folder this run cannot relate to the roms, and the entries are left out
|
||||
with the reason.
|
||||
"""
|
||||
below = [entry for entry in files if entry.get("root") == "roms"]
|
||||
if not below:
|
||||
return files, []
|
||||
layout = manifest.get("roms_directory") or {}
|
||||
if layout and bios_path.name == layout.get("bios_folder"):
|
||||
_ROMS_DIRS[bios_path] = bios_path.parent
|
||||
_ROMS_DIRS[bios_path] = Path(os.path.normpath(bios_path / layout["from_bios"]))
|
||||
return files, []
|
||||
if say:
|
||||
print(f" {_plural(len(below), 'file')} read from {display}'s roms folder left out: "
|
||||
|
||||
Reference in new issue
Block a user