⚡ Full migration to esp-idf

esp32/include/template/stateful_persistence.h

@@ -1,24 +1,11 @@
 #ifndef FSPersistence_h
 #define FSPersistence_h
 
-/**
- *   ESP32 SvelteKit
- *
- *   A simple, secure and extensible framework for IoT projects for ESP32 platforms
- *   with responsive Sveltekit front-end built with TailwindCSS and DaisyUI.
- *   https://github.com/theelims/ESP32-sveltekit
- *
- *   Copyright (C) 2018 - 2023 rjwats
- *   Copyright (C) 2023 theelims
- *   Copyright (C) 2025 runeharlyk
- *
- *   All Rights Reserved. This software may be modified and distributed under
- *   the terms of the LGPL v3 license. See the LICENSE file for details.
- **/
-
-#include <FS.h>
 #include <template/stateful_service.h>
 #include <filesystem.h>
+#include <ArduinoJson.h>
+#include <cstdio>
+#include <sys/stat.h>
 
 template <class T>
 class FSPersistence {
@@ -34,25 +21,18 @@ class FSPersistence {
     }
 
     void readFromFS() {
-        File settingsFile = _fs->open(_filePath, "r");
+        std::string content = FileSystem::readFile(_filePath);
 
-        if (settingsFile) {
+        if (!content.empty()) {
             JsonDocument jsonDocument;
-            DeserializationError error = deserializeJson(jsonDocument, settingsFile);
+            DeserializationError error = deserializeJson(jsonDocument, content);
             if (error == DeserializationError::Ok) {
                 JsonVariant jsonObject = jsonDocument.as<JsonVariant>();
                 _statefulService->updateWithoutPropagation(jsonObject, _stateUpdater);
-                settingsFile.close();
                 return;
             }
-            settingsFile.close();
         }
 
-        // If we reach here we have not been successful in loading the config
-        // and hard-coded defaults are now applied. The settings are then
-        // written back to the file system so the defaults persist between
-        // resets. This last step is required as in some cases defaults contain
-        // randomly generated values which would otherwise be modified on reset.
         applyDefaults();
         writeToFS();
     }
@@ -64,13 +44,10 @@ class FSPersistence {
 
         mkdirs();
 
-        File file = _fs->open(_filePath, "w");
+        std::string content;
+        serializeJson(jsonDocument, content);
 
-        if (!file) return false;
-
-        serializeJson(jsonDocument, file);
-        file.close();
-        return true;
+        return FileSystem::writeFile(_filePath, content.c_str());
     }
 
     void disableUpdateHandler() {
@@ -90,26 +67,23 @@ class FSPersistence {
     JsonStateReader<T> _stateReader;
     JsonStateUpdater<T> _stateUpdater;
     StatefulService<T> *_statefulService;
-    FS *_fs {&ESP_FS};
     const char *_filePath;
     size_t _bufferSize;
     HandlerId _updateHandlerId;
 
-    // We assume we have a _filePath with format
-    // "/directory1/directory2/filename" We create a directory for each missing
-    // parent
     void mkdirs() {
         std::string path(_filePath);
         size_t index = 0;
         while ((index = path.find('/', index + 1)) != std::string::npos) {
             std::string segment = path.substr(0, index);
-            if (!_fs->exists(segment.c_str())) _fs->mkdir(segment.c_str());
+            struct stat st;
+            if (stat(segment.c_str(), &st) != 0) {
+                FileSystem::mkdirRecursive(segment.c_str());
+            }
         }
     }
 
   protected:
-    // We assume the updater supplies sensible defaults if an empty object
-    // is supplied, this virtual function allows that to be changed.
     virtual void applyDefaults() {
         JsonDocument jsonDocument;
         JsonVariant jsonObject = jsonDocument.as<JsonVariant>();
@@ -117,4 +91,4 @@ class FSPersistence {
     }
 };
 
-#endif // end FSPersistence
+#endif