If system.json fails to load, replace it with the stock PyUI one vs failing to start

Author: chrisj951

main-ui/devices/device_common.py

@@ -1,17 +1,20 @@
 
 
+import os
 import socket
 import subprocess
 import sys
 import time
 from audio.audio_player_none import AudioPlayerNone
 from controller.controller_inputs import ControllerInput
 from devices.abstract_device import AbstractDevice
+from devices.miyoo.system_config import SystemConfig
 from devices.utils.process_runner import ProcessRunner
 from devices.wifi.wifi_status import WifiStatus
 from display.display import Display
 from display.font_purpose import FontPurpose
 from utils import throttle
+from utils.config_copier import ConfigCopier
 from utils.logger import PyUiLogger
 
 
@@ -457,4 +460,12 @@ def startup_init(self, include_wifi):
     def might_require_surface_format_conversion(self):
         return False
 
-    
+    def _load_system_config(self, config_path, config_if_missing):
+        ConfigCopier.ensure_config(config_path, config_if_missing)
+        try:
+            self.system_config = SystemConfig(config_path)
+        except Exception as e:
+            PyUiLogger.get_logger().error(f"Failed to load system config, resetting config: {e}")
+            os.remove(config_path)
+            ConfigCopier.ensure_config(config_path, config_if_missing)
+            self.system_config = SystemConfig(config_path)

main-ui/devices/miyoo/flip/miyoo_a30.py

@@ -36,8 +36,7 @@ def __init__(self, device_name, main_ui_mode):
         self.audio_player = AudioPlayerDelegateSdl2()
         script_dir = Path(__file__).resolve().parent
         source = script_dir / 'a30-system.json'
-        ConfigCopier.ensure_config("/mnt/SDCARD/Saves/a30-system.json", source)
-        self.system_config = SystemConfig("/mnt/SDCARD/Saves/a30-system.json")
+        self._load_system_config("/mnt/SDCARD/Saves/a30-system.json", source)
 
         if(main_ui_mode):
             self.miyoo_games_file_parser = MiyooGamesFileParser()        

main-ui/devices/miyoo/flip/miyoo_flip.py

@@ -76,8 +76,7 @@ def __init__(self, device_name, main_ui_mode):
 
         script_dir = Path(__file__).resolve().parent
         source = script_dir / 'flip-system.json'
-        ConfigCopier.ensure_config("/mnt/SDCARD/Saves/flip-system.json", source)
-        self.system_config = SystemConfig("/mnt/SDCARD/Saves/flip-system.json")
+        self._load_system_config("/mnt/SDCARD/Saves/flip-system.json", source)
 
         if(main_ui_mode):
             self.miyoo_games_file_parser = MiyooGamesFileParser()        

main-ui/devices/miyoo/mini/miyoo_mini_common.py

@@ -45,8 +45,7 @@ def __init__(self, device_name, main_ui_mode, miyoo_mini_specific_model_variable
         self.miyoo_mini_specific_model_variables = miyoo_mini_specific_model_variables
         self.controller_interface = self.build_controller_interface()
 
-        ConfigCopier.ensure_config("/mnt/SDCARD/Saves/mini-flip-system.json", Path(__file__).resolve().parent  / 'mini-flip-system.json')
-        self.system_config = SystemConfig("/mnt/SDCARD/Saves/mini-flip-system.json")
+        self._load_system_config("/mnt/SDCARD/Saves/mini-flip-system.json", Path(__file__).resolve().parent  / 'mini-flip-system.json')
 
         if(main_ui_mode):
             self.miyoo_mini_flip_shared_memory_writer = MiyooMiniFlipSharedMemoryWriter()

main-ui/devices/muos/muos_device.py

@@ -37,8 +37,7 @@ def setup_system_config(self):
         self.parent_dir = os.path.dirname(base_dir)
         source = os.path.join(self.script_dir,"muos-system.json") 
         system_json_path = os.path.join(self.parent_dir,"muos-system.json")
-        ConfigCopier.ensure_config(system_json_path, Path(source))
-        self.system_config = SystemConfig(system_json_path)
+        self._load_system_config(system_json_path, Path(source))
 
     def sleep(self):
         ProcessRunner.run(["/opt/muos/script/system/suspend.sh"])

main-ui/devices/trimui/trim_ui_brick.py

@@ -31,8 +31,7 @@ def __init__(self, device_name, main_ui_mode):
         self.audio_player = AudioPlayerDelegateSdl2()
         script_dir = Path(__file__).resolve().parent
         source = script_dir / 'brick-system.json'
-        ConfigCopier.ensure_config("/mnt/SDCARD/Saves/trim-ui-brick-system.json", source)
-        self.system_config = SystemConfig("/mnt/SDCARD/Saves/trim-ui-brick-system.json")
+        self._load_system_config("/mnt/SDCARD/Saves/trim-ui-brick-system.json", source)
 
         if(main_ui_mode):
             trim_stock_json_file = script_dir / 'stock/brick.json'

main-ui/devices/trimui/trim_ui_smart_pro.py

@@ -30,8 +30,7 @@ def __init__(self, device_name,main_ui_mode):
 
         script_dir = Path(__file__).resolve().parent
         source = script_dir / 'brick-system.json'
-        ConfigCopier.ensure_config("/mnt/SDCARD/Saves/trim-ui-smart-pro-system.json", source)
-        self.system_config = SystemConfig("/mnt/SDCARD/Saves/trim-ui-smart-pro-system.json")
+        self._load_system_config("/mnt/SDCARD/Saves/trim-ui-smart-pro-system.json", source)
         if(main_ui_mode):
             trim_stock_json_file = script_dir / 'stock/brick.json'
             ConfigCopier.ensure_config(TrimUISmartPro.TRIMUI_STOCK_CONFIG_LOCATION, trim_stock_json_file)

main-ui/devices/trimui/trim_ui_smart_pro_s.py

@@ -30,8 +30,7 @@ def __init__(self, device_name,main_ui_mode):
 
         script_dir = Path(__file__).resolve().parent
         source = script_dir / 'brick-system.json'
-        ConfigCopier.ensure_config("/mnt/SDCARD/Saves/trim-ui-smart-pro-s-system.json", source)
-        self.system_config = SystemConfig("/mnt/SDCARD/Saves/trim-ui-smart-pro-s-system.json")
+        self._load_system_config("/mnt/SDCARD/Saves/trim-ui-smart-pro-s-system.json", source)
         self.mainui_volume = 0
 
         if(main_ui_mode):