From f7504dcc36691749de3147980ca1f0f359f0aa3c Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Mon, 29 Apr 2024 16:05:12 +0200
Subject: [PATCH] presets.json PSRAM caching: consider cacheInvalidate

* trying to make the caching mechanism bulletproof.
`cacheInvalidate` is changed when
- autosave usermod updates presets
- a file was upload
* (coding style) fixed some unitialized variables
---
 wled00/file.cpp | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/wled00/file.cpp b/wled00/file.cpp
index 2b83d7f2..5affc666 100644
--- a/wled00/file.cpp
+++ b/wled00/file.cpp
@@ -412,16 +412,20 @@ static String getContentType(AsyncWebServerRequest* request, String filename){
 // original idea by @akaricchi (https://github.com/Akaricchi)
 // returns a pointer to the PSRAM buffer, updates size parameter
 static const uint8_t *getPresetCache(size_t &size) {
-  static unsigned long presetsCachedTime;
-  static uint8_t *presetsCached;
-  static size_t presetsCachedSize;
+  static unsigned long presetsCachedTime = 0;
+  static uint8_t *presetsCached = nullptr;
+  static size_t presetsCachedSize = 0;
+  static byte presetsCachedValidate = 0;
 
   if (!psramFound()) {
     size = 0;
     return nullptr;
   }
 
-  if (presetsModifiedTime != presetsCachedTime) {
+  //if (presetsModifiedTime != presetsCachedTime) DEBUG_PRINTLN(F("getPresetCache(): presetsModifiedTime changed."));
+  //if (presetsCachedValidate != cacheInvalidate) DEBUG_PRINTLN(F("getPresetCache(): cacheInvalidate changed."));
+
+  if ((presetsModifiedTime != presetsCachedTime) || (presetsCachedValidate != cacheInvalidate)) {
     if (presetsCached) {
       free(presetsCached);
       presetsCached = nullptr;
@@ -432,6 +436,7 @@ static const uint8_t *getPresetCache(size_t &size) {
     File file = WLED_FS.open("/presets.json", "r");
     if (file) {
       presetsCachedTime = presetsModifiedTime;
+      presetsCachedValidate = cacheInvalidate;
       presetsCachedSize = 0;
       presetsCached = (uint8_t*)ps_malloc(file.size() + 1);
       if (presetsCached) {