Add default support for ESP-WROVER-B and dynamic art cache sizing

Author: Electric-Diversions

platformio.ini

@@ -43,9 +43,11 @@ build_flags =
 	-D SMOOTH_FONT=1
 	-D SPI_FREQUENCY=27000000
 	-I /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/**
-extra_scripts = pre:generate_compile_time.py	
-;board_build.partitions = no_ota.csv
-board_build.partitions = partitions/custom_no_ota.csv
+extra_scripts = pre:generate_compile_time.py
+; no_ota.csv is 4MB ESP32-WROVER-B compatible. limits art cache to 10 albums.  	
+board_build.partitions = no_ota.csv
+; custom_no_ota.csv is 8MB Flash ESP32-WROVER-E compatible. art cache supports 60 albums.
+; board_build.partitions = partitions/custom_no_ota.csv
 board_build.filesystem = littlefs
 lib_deps = 
 	arkhipenko/TaskScheduler @ ^3.8.5

src/SCFileIO.cpp

@@ -98,6 +98,30 @@ bool SCFileIO::initialize()
 
 }
 
+/*
+** ===================================================================
+** getPartitionSize()
+**    Returns the total size in bytes of the mounted LittleFS partition.
+**
+** Returns:
+**    Size of the partition in bytes. Returns 0 if the value can't be retrieved
+**    or the semaphore acquisition fails.
+** ===================================================================
+*/
+size_t SCFileIO::getPartitionSize()
+{
+    if (!takeSemaphore())
+    {
+        spLogE(LOGTAG_FILEIO, "Failed to acquire semaphore for getPartitionSize().");
+        return 0;
+    }
+
+    size_t partitionSize = LittleFS.totalBytes();  // No need for FSInfo
+
+    giveSemaphore();
+    return partitionSize;
+}
+
 /*
 ** ===================================================================
 ** open()

src/SCFileIO.h

@@ -34,6 +34,9 @@ class SCFileIO
     // Initializes the semaphore. Must be called before using the class.
     bool initialize();
 
+    // Get partition size
+    size_t getPartitionSize();
+
     // Opens a file safely using LittleFS
     File open(const char *path, const char *mode);
 

src/SpotifyArtMgr.cpp

@@ -141,6 +141,8 @@ SpotifyArtMgr* SpotifyArtMgr::getInstance()
     if (gInstance == nullptr)
     {
         gInstance = new SpotifyArtMgr();
+        // figure out if configured with more than 4MB of file space
+        gInstance->determineCacheSize();
         // populate the index to last run
         String filePath = String(gCacheFileroot) + ".txt";
         SCFileIO::getInstance().hexDump(LOGTAG_CACHE, filePath.c_str());
@@ -655,6 +657,43 @@ void SpotifyArtMgr::saveCacheIndex()
     //SCFileIO::getInstance().listFiles();
 }
 
+/*
+** ===================================================================
+** determineCacheSize()
+**    Determines the maximum number of album art files to cache based
+**    on the size of the LittleFS partition. If the partition is at
+**    least 3,000,000 bytes, this is assumed to be a custom partition
+**    layout and the cache size is increased to 60. Otherwise, the
+**    default cache size (typically 10) is used.
+**
+**    This method should be called during initialization to adjust the
+**    cache size dynamically based on the hardware configuration.
+**
+** Notes:
+**    - SCFileIO::getPartitionSize() is used to obtain the partition size
+**      in a thread-safe manner.
+**    - A partition size >= 3,000,000 bytes indicates use of the custom
+**      no_ota.csv layout with a larger cache capacity.
+**    - The default cache size should be initialized before this is called.
+**
+** ===================================================================
+*/
+
+void SpotifyArtMgr::determineCacheSize()
+{
+    size_t partitionSize = SCFileIO::getInstance().getPartitionSize();
+
+    if (partitionSize >= 3000000)
+    {
+        _maxCacheSize = 60;
+        spLogI(LOGTAG_CACHE, "Custom partition detected (size: %zu). Setting max cache size to 60.", partitionSize);
+    }
+    else
+    {
+        spLogI(LOGTAG_CACHE, "Standard partition detected (size: %zu). Using default cache size: %zu.", partitionSize, _maxCacheSize);
+    }
+}
+
 /*
 ** ===================================================================
 ** loadCacheIndex()
@@ -795,6 +834,8 @@ void SpotifyArtMgr::loadCacheIndex()
 ** ===================================================================
 ** printCacheIndex()
 **    Logs the current cache state in a formatted and readable format.
+**    Check code for log levels used.
+**
 **    The log includes:
 **      - List of URLs and their associated file names in the LRU order.
 **      - The calculated checksum for the cache state.
@@ -825,7 +866,7 @@ void SpotifyArtMgr::loadCacheIndex()
 void SpotifyArtMgr::printCacheIndex(const char* tag)
 {
     spLogD(tag, "------------------------------------------------------------------------------------------");
-    spLogI(tag, "Cache:");
+    spLogD(tag, "Cache:");
 
     // If the cache is empty, indicate that
     if (_cacheList.empty())
@@ -843,7 +884,7 @@ void SpotifyArtMgr::printCacheIndex(const char* tag)
         auto it = _urlToFileMap.find(url);
         if (it != _urlToFileMap.end())
         {
-            spLogI(tag, "    \"%s\": \"%s\"", url.c_str(), it->second.c_str());
+            spLogD(tag, "    \"%s\": \"%s\"", url.c_str(), it->second.c_str());
             serializedData += url + ":" + it->second + "\n";
         }
         else

src/SpotifyArtMgr.h

@@ -89,6 +89,7 @@ class SpotifyArtMgr
     SpotifyArtMgr();
 
     // Private methods
+    void     determineCacheSize();
     void     loadCacheIndex();
     bool     downloadFile(String url, String filename);
     String   generateLocalFileName();
@@ -101,7 +102,7 @@ class SpotifyArtMgr
     static SpotifyArtMgr*    gInstance;
 
     // Cache configuration
-    size_t                   _maxCacheSize = 60;    // Default maximum cache size
+    size_t                   _maxCacheSize = 10;    // Default maximum cache size
 
     SemaphoreHandle_t xSemaphoreArtFetchCompleted = xSemaphoreCreateMutex();;
     bool              _isDownloadPending          = false;

src/Vault.cpp

@@ -116,7 +116,7 @@ void Vault::initialize()
     if (!LittleFS.exists(USER_INI_PATH)) 
     {
         _useHardcodedValues = true;
-        spLogV(LOGTAG_VAULT, "%s does not exist. Using hardcoded credentials.", USER_INI_PATH);
+        spLogI(LOGTAG_VAULT, "%s does not exist. Using hardcoded credentials.", USER_INI_PATH);
         return;
     }
 

src/main.cpp

@@ -329,8 +329,8 @@ void setupLogging()
     logger.setLogLevel(LOGTAG_HEAP, ESP_LOG_INFO);
     //logger.setLogLevel(LOGTAG_TRACE, ESP_LOG_INFO);
     logger.setLogLevel(LOGTAG_FILEIO, ESP_LOG_INFO);
-    // logger.setLogLevel(LOGTAG_CACHE, ESP_LOG_DEBUG);
-    logger.setLogLevel(LOGTAG_VAULT, ESP_LOG_VERBOSE);    
+    logger.setLogLevel(LOGTAG_CACHE, ESP_LOG_INFO);
+    logger.setLogLevel(LOGTAG_VAULT, ESP_LOG_INFO);    
 
     // Supress logs for ESP32 components
     logger.setLogLevel("ssl_client", ESP_LOG_NONE);