Merge remote-tracking branch 'origin/main' into main

Tactility/Source/service/development/DevelopmentSettings.cpp

@@ -1,6 +1,8 @@
 #ifdef ESP_PLATFORM
+#include <Tactility/file/File.h>
 #include <Tactility/file/PropertiesFile.h>
 #include <Tactility/Logger.h>
+#include <Tactility/Paths.h>
 #include <Tactility/service/development/DevelopmentSettings.h>
 #include <map>
 #include <string>
@@ -9,7 +11,10 @@ namespace tt::service::development {
 
 static const auto LOGGER = Logger("DevSettings");
 
-constexpr auto* SETTINGS_FILE = "/data/settings/development.properties";
+static std::string getSettingsFilePath() {
+    return getUserDataPath() + "/settings/development.properties";
+}
+
 constexpr auto* SETTINGS_KEY_ENABLE_ON_BOOT = "enableOnBoot";
 
 struct DevelopmentSettings {
@@ -17,8 +22,13 @@ struct DevelopmentSettings {
 };
 
 static bool load(DevelopmentSettings& settings) {
+    auto settings_path = getSettingsFilePath();
+    if (!file::isFile(settings_path)) {
+        return false;
+    }
+
     std::map<std::string, std::string> map;
-    if (!file::loadPropertiesFile(SETTINGS_FILE, map)) {
+    if (!file::loadPropertiesFile(settings_path, map)) {
         return false;
     }
 
@@ -34,13 +44,18 @@ static bool load(DevelopmentSettings& settings) {
 static bool save(const DevelopmentSettings& settings) {
     std::map<std::string, std::string> map;
     map[SETTINGS_KEY_ENABLE_ON_BOOT] = settings.enableOnBoot ? "true" : "false";
-    return file::savePropertiesFile(SETTINGS_FILE, map);
+    auto settings_path = getSettingsFilePath();
+    if (!file::findOrCreateParentDirectory(settings_path, 0755)) {
+        LOGGER.error("Failed to create parent dir for {}", settings_path);
+        return false;
+    }
+    return file::savePropertiesFile(settings_path, map);
 }
 
 void setEnableOnBoot(bool enable) {
     DevelopmentSettings properties { .enableOnBoot = enable };
     if (!save(properties)) {
-        LOGGER.error("Failed to save {}", SETTINGS_FILE);
+        LOGGER.error("Failed to save {}", getSettingsFilePath());
     }
 }