From 8e91b32d26d8e88057c0cc248593ff5f74ed1703 Mon Sep 17 00:00:00 2001
From: skymike03 <mike.bosche@laposte.net>
Date: Fri, 29 Aug 2025 12:35:48 +0200
Subject: [PATCH] Reorganize folder paths in config.py

---
 ports/RGSX/config.py   | 15 ++++++++++-----
 ports/RGSX/controls.py |  4 ++--
 ports/RGSX/utils.py    |  2 +-
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/ports/RGSX/config.py b/ports/RGSX/config.py
index 560834e..52f7dde 100644
--- a/ports/RGSX/config.py
+++ b/ports/RGSX/config.py
@@ -61,25 +61,30 @@ def get_system_root():
         return "/" if not OPERATING_SYSTEM == "Windows" else os.path.splitdrive(os.getcwd())[0] + os.sep
 
 # Chemins de base
-
 SYSTEM_FOLDER = get_system_root()
 APP_FOLDER = os.path.join(get_application_root(), "RGSX")
 ROMS_FOLDER = os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(APP_FOLDER))), "roms")
 SAVE_FOLDER = os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(APP_FOLDER))), "saves", "ports", "rgsx")
+
 # Configuration du logging
 logger = logging.getLogger(__name__)
 log_dir = os.path.join(APP_FOLDER, "logs")
 log_file = os.path.join(log_dir, "RGSX.log")
 
 # Chemins de base
-UPDATE_FOLDER = os.path.join(APP_FOLDER, "update")
 GAMELISTXML = os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(APP_FOLDER))), "roms", "ports", "gamelist.xml")
-IMAGES_FOLDER = os.path.join(APP_FOLDER, "images", "systemes")
-GAMES_FOLDER = os.path.join(APP_FOLDER, "games")
+
+#Dossier /roms/ports/rgsx
+UPDATE_FOLDER = os.path.join(APP_FOLDER, "update")
 LANGUAGES_FOLDER = os.path.join(APP_FOLDER, "languages")
+JSON_EXTENSIONS = os.path.join(APP_FOLDER, "rom_extensions.json")
+
+#Dossier /saves/ports/rgsx
+IMAGES_FOLDER = os.path.join(SAVE_FOLDER, "images", "systemes")
+GAMES_FOLDER = os.path.join(SAVE_FOLDER, "games")
+SOURCES_FILE = os.path.join(SAVE_FOLDER, "sources.json")
 CONTROLS_CONFIG_PATH = os.path.join(SAVE_FOLDER, "controls.json")
 HISTORY_PATH = os.path.join(SAVE_FOLDER, "history.json")
-JSON_EXTENSIONS = os.path.join(APP_FOLDER, "rom_extensions.json")
 
 # Nouveau fichier unifié pour les paramètres RGSX
 RGSX_SETTINGS_PATH = os.path.join(SAVE_FOLDER, "rgsx_settings.json")
diff --git a/ports/RGSX/controls.py b/ports/RGSX/controls.py
index 0f68afa..7df1676 100644
--- a/ports/RGSX/controls.py
+++ b/ports/RGSX/controls.py
@@ -1099,9 +1099,9 @@ def handle_controls(event, sources, joystick, screen):
                     logger.debug("Début du redownload des jeux")
                     config.download_tasks.clear()
                     config.pending_download = None
-                    if os.path.exists(config.APP_FOLDER + "/sources.json"):
+                    if os.path.exists(config.SOURCES_FILE):
                         try:
-                            os.remove(config.APP_FOLDER + "/sources.json")
+                            os.remove(config.SOURCES_FILE)
                             logger.debug("Fichier sources.json supprimé avec succès")
                             if os.path.exists(config.GAMES_FOLDER):
                                 shutil.rmtree(config.GAMES_FOLDER)
diff --git a/ports/RGSX/utils.py b/ports/RGSX/utils.py
index b081013..7f06266 100644
--- a/ports/RGSX/utils.py
+++ b/ports/RGSX/utils.py
@@ -109,7 +109,7 @@ def is_extension_supported(filename, platform, extensions_data):
 # Fonction pour charger sources.json
 def load_sources():
     """Charge les sources depuis sources.json et initialise les plateformes."""
-    sources_path = os.path.join(config.APP_FOLDER, "sources.json")
+    sources_path = os.path.join(config.SOURCES_FILE)
     logger.debug(f"Chargement de {sources_path}")
     try:
         with open(sources_path, 'r', encoding='utf-8') as f: