Merge b483b46b40 into da4d3b5ea5

open-x4-sdk

@@ -1 +1 @@
-Subproject commit c39f253a7dabbc193a8d7d310fb8777dca0ab8f1
+Subproject commit bd4e6707503ab9c97d13ee0d8f8c69e9ff03cd12

src/network/CrossPointWebServer.cpp

@@ -1,6 +1,7 @@
 #include "CrossPointWebServer.h"
 
 #include <ArduinoJson.h>
+#include "util/BookCacheManager.h"
 #include <Epub.h>
 #include <FsHelpers.h>
 #include <SDCardManager.h>
@@ -11,7 +12,6 @@
 
 #include "html/FilesPageHtml.generated.h"
 #include "html/HomePageHtml.generated.h"
-#include "util/BookCacheManager.h"
 #include "util/StringUtils.h"
 
 namespace {
@@ -875,6 +875,8 @@ void CrossPointWebServer::handleRename() const {
   }
 }
 
+
+
 // WebSocket callback trampoline
 void CrossPointWebServer::wsEventCallback(uint8_t num, WStype_t type, uint8_t* payload, size_t length) {
   if (wsInstance) {

src/network/CrossPointWebServer.h

@@ -80,4 +80,5 @@ class CrossPointWebServer {
   void handleDelete() const;
   void handleMove() const;
   void handleRename() const;
+
 };

src/util/BookCacheManager.cpp

@@ -1,10 +1,8 @@
 #include "BookCacheManager.h"
-
-#include <HardwareSerial.h>
-
-#include "../CrossPointState.h"
-#include "../RecentBooksStore.h"
 #include "StringUtils.h"
+#include <HardwareSerial.h>
+#include "../RecentBooksStore.h"
+#include "../CrossPointState.h"
 
 bool BookCacheManager::migrateCache(const String& oldPath, const String& newPath) {
   if (oldPath == newPath) return true;
@@ -54,7 +52,7 @@ bool BookCacheManager::migrateCache(const String& oldPath, const String& newPath
 
   // It's a file. check if it's a supported book type
   if (!isSupportedFile(oldPath)) {
-    return true;  // Not a book, nothing to migrate
+    return true; // Not a book, nothing to migrate
   }
 
   String oldCache = getCachePath(oldPath);
@@ -80,7 +78,7 @@ bool BookCacheManager::migrateCache(const String& oldPath, const String& newPath
     }
   }
 
-  return true;  // No old cache to migrate
+  return true; // No old cache to migrate
 }
 
 String BookCacheManager::getCachePath(const String& path) {
@@ -91,13 +89,15 @@ String BookCacheManager::getCachePath(const String& path) {
 }
 
 bool BookCacheManager::isSupportedFile(const String& path) {
-  return StringUtils::checkFileExtension(path, ".epub") || StringUtils::checkFileExtension(path, ".txt") ||
+  return StringUtils::checkFileExtension(path, ".epub") ||
-         StringUtils::checkFileExtension(path, ".xtc") || StringUtils::checkFileExtension(path, ".xtg") ||
+         StringUtils::checkFileExtension(path, ".txt") ||
+         StringUtils::checkFileExtension(path, ".xtc") ||
+         StringUtils::checkFileExtension(path, ".xtg") ||
          StringUtils::checkFileExtension(path, ".xth");
 }
 
 String BookCacheManager::getCachePrefix(const String& path) {
   if (StringUtils::checkFileExtension(path, ".epub")) return "epub";
   if (StringUtils::checkFileExtension(path, ".txt")) return "txt";
-  return "xtc";  // .xtc, .xtg, .xth
+  return "xtc"; // .xtc, .xtg, .xth
 }

src/util/BookCacheManager.h

@@ -2,7 +2,6 @@
 
 #include <SDCardManager.h>
 #include <WString.h>
-
 #include <string>
 
 class BookCacheManager {