Open/RGSX
1
0
Fork 0
forked from Mirrors/RGSX
Code Pull Requests Activity

little update folder read json

Browse Source
This commit is contained in:
skymike03
2025-09-05 09:58:59 +02:00
parent 6e89e66c6b
commit 101729cdca
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ports/RGSX/network.py
View File

@@ -261,7 +261,8 @@ async def download_rom(url, platform, game_name, is_zip_non_supported=False, tas
dest_dir = None dest_dir = None
for platform_dict in config.platform_dicts: for platform_dict in config.platform_dicts:
if platform_dict.get("platform_name") == platform: if platform_dict.get("platform_name") == platform:
platform_folder = platform_dict.get("folder", normalize_platform_name(platform)) # Priorité: clé 'folder'; fallback legacy: 'dossier'; sinon normalisation du nom de plateforme
platform_folder = platform_dict.get("folder") or platform_dict.get("dossier") or normalize_platform_name(platform)
dest_dir = apply_symlink_path(config.ROMS_FOLDER, platform_folder) dest_dir = apply_symlink_path(config.ROMS_FOLDER, platform_folder)
logger.debug(f"Répertoire de destination trouvé pour {platform}: {dest_dir}") logger.debug(f"Répertoire de destination trouvé pour {platform}: {dest_dir}")
break break
@@ -545,11 +546,11 @@ async def download_from_1fichier(url, platform, game_name, is_zip_non_supported=
dest_dir = None dest_dir = None
for platform_dict in config.platform_dicts: for platform_dict in config.platform_dicts:
if platform_dict.get("platform_name") == platform: if platform_dict.get("platform_name") == platform:
platform_folder = platform_dict.get("folder", normalize_platform_name(platform)) platform_folder = platform_dict.get("folder") or platform_dict.get("dossier") or normalize_platform_name(platform)
dest_dir = apply_symlink_path(config.ROMS_FOLDER, platform_folder) dest_dir = apply_symlink_path(config.ROMS_FOLDER, platform_folder)
break break
if not dest_dir: if not dest_dir:
logger.warning(f"Aucun dossier 'folder' trouvé pour la plateforme {platform}") logger.warning(f"Aucun dossier 'folder'/'dossier' trouvé pour la plateforme {platform}")
platform_folder = normalize_platform_name(platform) platform_folder = normalize_platform_name(platform)
dest_dir = apply_symlink_path(config.ROMS_FOLDER, platform_folder) dest_dir = apply_symlink_path(config.ROMS_FOLDER, platform_folder)
logger.debug(f"Répertoire destination déterminé: {dest_dir}") logger.debug(f"Répertoire destination déterminé: {dest_dir}")

5
ports/RGSX/utils.py
View File

@@ -168,6 +168,11 @@ def load_sources():
# Supporter ancienne clé system_image -> platform_image si présente # Supporter ancienne clé system_image -> platform_image si présente
legacy = s.pop("system_image", "") if isinstance(s, dict) else "" legacy = s.pop("system_image", "") if isinstance(s, dict) else ""
s["platform_image"] = legacy or "" s["platform_image"] = legacy or ""
# Normaliser clé dossier -> folder si besoin (legacy francophone)
if isinstance(s, dict) and "folder" not in s:
legacy_folder = s.get("dossier") or s.get("folder_name")
if legacy_folder:
s["folder"] = legacy_folder
existing_names = {s.get("platform_name", "") for s in sources} existing_names = {s.get("platform_name", "") for s in sources}
added = [] added = []