rg_settings: Added a safe_mode (no loading/saving of config files)

`rg_settings_reset` is still allowed to change files on disk, because wiping existing config is "safe" in that context.

Author: ducalex

components/retro-go/rg_settings.c

@@ -6,6 +6,7 @@
 #include <cJSON.h>
 
 static cJSON *config_root = NULL;
+static bool safe_mode = false;
 
 
 static cJSON *json_root(const char *name, bool set_dirty)
@@ -30,23 +31,25 @@ static cJSON *json_root(const char *name, bool set_dirty)
         branch = cJSON_AddObjectToObject(config_root, name);
         cJSON_AddStringToObject(branch, "namespace", name);
         cJSON_AddNumberToObject(branch, "changed", 0);
-
-        char *data; size_t data_len;
-        char pathbuf[RG_PATH_MAX];
-        snprintf(pathbuf, RG_PATH_MAX, "%s/%s.json", RG_BASE_PATH_CONFIG, name);
-        if (rg_storage_read_file(pathbuf, (void **)&data, &data_len, 0))
+        if (!safe_mode)
         {
-            cJSON *values = cJSON_Parse(data);
-            if (!values) // Parse failure, clean the markup and try again
-                values = cJSON_Parse(rg_json_fixup(data));
-            if (values)
+            char *data; size_t data_len;
+            char pathbuf[RG_PATH_MAX];
+            snprintf(pathbuf, RG_PATH_MAX, "%s/%s.json", RG_BASE_PATH_CONFIG, name);
+            if (rg_storage_read_file(pathbuf, (void **)&data, &data_len, 0))
             {
-                RG_LOGI("Config file loaded: '%s'", pathbuf);
-                cJSON_AddItemToObject(branch, "values", values);
+                cJSON *values = cJSON_Parse(data);
+                if (!values) // Parse failure, clean the markup and try again
+                    values = cJSON_Parse(rg_json_fixup(data));
+                if (values)
+                {
+                    RG_LOGI("Config file loaded: '%s'", pathbuf);
+                    cJSON_AddItemToObject(branch, "values", values);
+                }
+                else
+                    RG_LOGE("Config file parsing failed: '%s'", pathbuf);
+                free(data);
             }
-            else
-                RG_LOGE("Config file parsing failed: '%s'", pathbuf);
-            free(data);
         }
     }
 
@@ -76,16 +79,17 @@ static void update_value(const char *section, const char *key, cJSON *new_value)
         cJSON_Delete(new_value);
 }
 
-void rg_settings_init(void)
+void rg_settings_init(bool _safe_mode)
 {
     config_root = cJSON_CreateObject();
+    safe_mode = _safe_mode;
     json_root(NS_GLOBAL, 0);
     json_root(NS_BOOT, 0);
 }
 
 void rg_settings_commit(void)
 {
-    if (!config_root)
+    if (!config_root || safe_mode)
         return;
 
     for (cJSON *branch = config_root->child; branch; branch = branch->next)

components/retro-go/rg_settings.h

@@ -10,7 +10,8 @@
 #define NS_WIFI   ((char *)3)
 #define NS_BOOT   ((char *)4)
 
-void rg_settings_init(void);
+// Safe mode means no loading/saving config files
+void rg_settings_init(bool safe_mode);
 void rg_settings_commit(void);
 void rg_settings_reset(void);
 double rg_settings_get_number(const char *section, const char *key, double default_value);

components/retro-go/rg_system.c

@@ -289,6 +289,7 @@ static void enter_recovery_mode(void)
 {
     RG_LOGW("Entering recovery mode...\n");
 
+    // FIXME: At this point we don't have valid settings, we should find way to get the user's language...
     const rg_gui_option_t options[] = {
         {0, _("Reset all settings"), NULL, RG_DIALOG_FLAG_NORMAL, NULL},
         {1, _("Reboot to factory "), NULL, RG_DIALOG_FLAG_NORMAL, NULL},
@@ -414,11 +415,12 @@ rg_app_t *rg_system_init(int sampleRate, const rg_handlers_t *handlers, const rg
         rg_task_delay(100);
     }
 
+    rg_settings_init(enterRecoveryMode || showCrashDialog);
+    rg_display_init();
+    rg_gui_init();
+
     if (enterRecoveryMode)
     {
-        rg_display_init();
-        //rg_settings_init();  FIXME: Find a way to get the user's language without loading all settings
-        rg_gui_init();
         enter_recovery_mode();
     }
     else if (showCrashDialog)
@@ -433,8 +435,6 @@ rg_app_t *rg_system_init(int sampleRate, const rg_handlers_t *handlers, const rg
             if (rg_system_save_trace(RG_STORAGE_ROOT "/crash.log", 1))
                 strcat(message, "\nLog saved to SD Card.");
         }
-        rg_display_init();
-        rg_gui_init();
         rg_display_clear(C_BLUE);
         rg_gui_alert("System Panic!", message);
         rg_system_exit();
@@ -445,7 +445,6 @@ rg_app_t *rg_system_init(int sampleRate, const rg_handlers_t *handlers, const rg
     update_memory_statistics();
     app.lowMemoryMode = statistics.totalMemoryExt == 0;
 
-    rg_settings_init();
     app.configNs = rg_settings_get_string(NS_BOOT, SETTING_BOOT_NAME, app.name);
     app.bootArgs = rg_settings_get_string(NS_BOOT, SETTING_BOOT_ARGS, "");
     app.bootFlags = rg_settings_get_number(NS_BOOT, SETTING_BOOT_FLAGS, 0);
@@ -454,8 +453,6 @@ rg_app_t *rg_system_init(int sampleRate, const rg_handlers_t *handlers, const rg
     // app.isLauncher = strcmp(app.name, RG_APP_LAUNCHER) == 0; // Might be overriden after init
     app.indicatorsMask = rg_settings_get_number(NS_GLOBAL, SETTING_INDICATOR_MASK, app.indicatorsMask);
 
-    rg_display_init();
-    rg_gui_init();
     rg_gui_draw_hourglass();
     rg_audio_init(sampleRate);