feat(logging): implement logging level configuration from RetroDECK settings

Author: XargonWan

es-app/src/guis/GuiMenu.cpp

@@ -2663,25 +2663,64 @@ void GuiMenu::openRetroDeckGodotConfigurator()
     // You can add any checks for the script's outcome here.
 }
 
-#endif
-
-#if defined(RETRODECK)
 void GuiMenu::openESDEConfiguration()
 {
     auto s = new GuiSettings(_("ES-DE CONFIGURATIONS"));
 
-    // Logging level setting for RetroDECK
-    auto loggingLevel = std::make_shared<OptionListComponent<std::string>>(_("LOGGING LEVEL"), false);
-    loggingLevel->add(_("DEBUG"), "debug", Settings::getInstance()->getString("LoggingLevel") == "debug");
-    loggingLevel->add(_("INFO"), "info", Settings::getInstance()->getString("LoggingLevel") == "info");
-    loggingLevel->add(_("WARNING"), "warning", Settings::getInstance()->getString("LoggingLevel") == "warning");
-    loggingLevel->add(_("ERROR"), "error", Settings::getInstance()->getString("LoggingLevel") == "error");
-    s->addWithLabel(_("LOGGING LEVEL"), loggingLevel);
-    s->addSaveFunc([loggingLevel] {
-        Settings::getInstance()->setString("LoggingLevel", loggingLevel->getSelected());
-        Settings::getInstance()->saveFile();
-        Log::setReportingLevelFromEnv(); // Assuming this function exists to update logging level
-    });
+    // UI Settings submenu
+    ComponentListRow uiSettingsRow;
+    uiSettingsRow.elements.clear();
+    uiSettingsRow.addElement(std::make_shared<TextComponent>(_("UI SETTINGS"),
+                                                             Font::get(FONT_SIZE_MEDIUM),
+                                                             mMenuColorPrimary),
+                             true);
+    uiSettingsRow.addElement(mMenu.makeArrow(), false);
+    uiSettingsRow.makeAcceptInputHandler(std::bind(&GuiMenu::openUIOptions, this));
+    s->addRow(uiSettingsRow);
+
+    // Sound Settings submenu
+    ComponentListRow soundSettingsRow;
+    soundSettingsRow.elements.clear();
+    soundSettingsRow.addElement(std::make_shared<TextComponent>(_("SOUND SETTINGS"),
+                                                                Font::get(FONT_SIZE_MEDIUM),
+                                                                mMenuColorPrimary),
+                                true);
+    soundSettingsRow.addElement(mMenu.makeArrow(), false);
+    soundSettingsRow.makeAcceptInputHandler(std::bind(&GuiMenu::openSoundOptions, this));
+    s->addRow(soundSettingsRow);
+
+    // Input Device Settings submenu
+    ComponentListRow inputDeviceSettingsRow;
+    inputDeviceSettingsRow.elements.clear();
+    inputDeviceSettingsRow.addElement(std::make_shared<TextComponent>(_("INPUT DEVICE SETTINGS"),
+                                                                       Font::get(FONT_SIZE_MEDIUM),
+                                                                       mMenuColorPrimary),
+                                      true);
+    inputDeviceSettingsRow.addElement(mMenu.makeArrow(), false);
+    inputDeviceSettingsRow.makeAcceptInputHandler(std::bind(&GuiMenu::openInputDeviceOptions, this));
+    s->addRow(inputDeviceSettingsRow);
+
+    // Game Collection Settings submenu
+    ComponentListRow collectionSettingsRow;
+    collectionSettingsRow.elements.clear();
+    collectionSettingsRow.addElement(std::make_shared<TextComponent>(_("GAME COLLECTION SETTINGS"),
+                                                                      Font::get(FONT_SIZE_MEDIUM),
+                                                                      mMenuColorPrimary),
+                                     true);
+    collectionSettingsRow.addElement(mMenu.makeArrow(), false);
+    collectionSettingsRow.makeAcceptInputHandler(std::bind(&GuiMenu::openCollectionSystemOptions, this));
+    s->addRow(collectionSettingsRow);
+
+    // Other Settings submenu
+    ComponentListRow otherSettingsRow;
+    otherSettingsRow.elements.clear();
+    otherSettingsRow.addElement(std::make_shared<TextComponent>(_("OTHER SETTINGS"),
+                                                                Font::get(FONT_SIZE_MEDIUM),
+                                                                mMenuColorPrimary),
+                                true);
+    otherSettingsRow.addElement(mMenu.makeArrow(), false);
+    otherSettingsRow.makeAcceptInputHandler(std::bind(&GuiMenu::openOtherOptions, this));
+    s->addRow(otherSettingsRow);
 
     mWindow->pushGui(s);
 }

es-app/src/main.cpp

@@ -715,6 +715,12 @@ int main(int argc, char* argv[])
     // Start the logger.
     Log::init();
     Log::open();
+
+#if defined(RETRODECK)
+    // Set logging level from RetroDECK configuration file.
+    Log::setReportingLevelFromRetroDeckConfig();
+#endif
+
     {
         const std::string applicationName {"ES-DE"};
 #if defined(__ANDROID__)

es-core/src/Log.cpp

@@ -13,6 +13,7 @@
 
 #if defined(RETRODECK)
 #include <algorithm>
+#include <fstream>
 #endif
 
 LogLevel Log::getReportingLevel()
@@ -183,6 +184,74 @@ Log::~Log()
 
 // RetroDECK specific function
 #if defined(RETRODECK)
+void Log::setReportingLevelFromRetroDeckConfig()
+{
+    // Try to read the logging level from RetroDECK config file
+    const char* rdHomePath = std::getenv("RETRODECK_CONFIG_HOME");
+    if (!rdHomePath) {
+        LOG(LogError) << "setReportingLevelFromRetroDeckConfig: Failed to read rd_logging_level "
+                      << "- RETRODECK_CONFIG_HOME environment variable not set. Falling back to DEBUG.";
+        sReportingLevel = LogDebug;
+        return;
+    }
+
+    std::string configPath = std::string(rdHomePath) + "/retrodeck.cfg";
+    std::ifstream configFile(configPath);
+    if (!configFile.is_open()) {
+        LOG(LogError) << "setReportingLevelFromRetroDeckConfig: Failed to read rd_logging_level "
+                      << "from '" << configPath << "' - File not found. Falling back to DEBUG.";
+        sReportingLevel = LogDebug;
+        return;
+    }
+
+    // Parse the JSON file looking for rd_logging_level
+    std::string line;
+    std::string logLevel = "debug"; // Default fallback
+    bool found = false;
+
+    while (std::getline(configFile, line)) {
+        // Simple pattern matching for "rd_logging_level": "value"
+        size_t pos = line.find("\"rd_logging_level\"");
+        if (pos != std::string::npos) {
+            // Find the value between quotes after the colon
+            size_t colonPos = line.find(':', pos);
+            if (colonPos != std::string::npos) {
+                size_t firstQuote = line.find('"', colonPos);
+                size_t secondQuote = line.find('"', firstQuote + 1);
+                if (firstQuote != std::string::npos && secondQuote != std::string::npos) {
+                    logLevel = line.substr(firstQuote + 1, secondQuote - firstQuote - 1);
+                    found = true;
+                    break;
+                }
+            }
+        }
+    }
+
+    configFile.close();
+
+    if (!found) {
+        LOG(LogError) << "setReportingLevelFromRetroDeckConfig: Failed to read rd_logging_level "
+                      << "from '" << configPath << "' - Setting not found. Falling back to DEBUG.";
+        sReportingLevel = LogDebug;
+        return;
+    }
+
+    // Map string to LogLevel
+    if (logLevel == "debug")
+        sReportingLevel = LogDebug;
+    else if (logLevel == "warning")
+        sReportingLevel = LogWarning;
+    else if (logLevel == "error")
+        sReportingLevel = LogError;
+    else if (logLevel == "info")
+        sReportingLevel = LogInfo;
+    else {
+        LOG(LogError) << "setReportingLevelFromRetroDeckConfig: Invalid rd_logging_level value '"
+                      << logLevel << "'. Falling back to DEBUG.";
+        sReportingLevel = LogDebug;
+    }
+}
+
 void Log::setReportingLevelFromEnv()
 {
     // Check for the logging_level environment variable

es-core/src/Log.h

@@ -54,6 +54,7 @@ class Log
     static void close();
 
     #if defined(RETRODECK)
+    static void setReportingLevelFromRetroDeckConfig();
     static void setReportingLevelFromEnv();
     #endif
 

es-core/src/Settings.cpp

@@ -179,9 +179,6 @@ void Settings::setDefaults()
     mStringMap["LaunchScreenDuration"] = {"normal", "normal"};
     mStringMap["UIMode"] = {"full", "full"};
     mStringMap["RandomEntryButton"] = {"games", "games"};
-    #if defined(RETRODECK)
-    mStringMap["LoggingLevel"] = {"info", "info"};
-    #endif
 
     // UI settings -> system status settings.
     mBoolMap["SystemStatusBluetooth"] = {true, true};