diff --git a/src/RecentBooksStore.h b/src/RecentBooksStore.h index 3574063f..ba205471 100644 --- a/src/RecentBooksStore.h +++ b/src/RecentBooksStore.h @@ -38,7 +38,7 @@ class RecentBooksStore { * Update the path of a book in the recent list. * Useful when moving/renaming files or entire directories. * If oldPath is a directory, all books within will have their paths updated. - * + * * @param oldPath Original absolute path * @param newPath New absolute path */ @@ -46,4 +46,4 @@ class RecentBooksStore { }; // Helper macro to access recent books store -#define RECENT_BOOKS RecentBooksStore::getInstance() +#define RECENT_BOOKS RecentBooksStore::getInstance() \ No newline at end of file diff --git a/src/network/CrossPointWebServer.cpp b/src/network/CrossPointWebServer.cpp index 70aaeec3..81be0da9 100644 --- a/src/network/CrossPointWebServer.cpp +++ b/src/network/CrossPointWebServer.cpp @@ -1,7 +1,6 @@ #include "CrossPointWebServer.h" #include -#include "util/BookCacheManager.h" #include #include #include @@ -12,6 +11,7 @@ #include "html/FilesPageHtml.generated.h" #include "html/HomePageHtml.generated.h" +#include "util/BookCacheManager.h" #include "util/StringUtils.h" namespace { @@ -848,7 +848,7 @@ void CrossPointWebServer::handleRename() const { if (!newPath.startsWith("/")) newPath = "/" + newPath; // Security check: prevent renaming system files - if (oldPath.substring(oldPath.lastIndexOf('/') + 1).startsWith(".") || + if (oldPath.substring(oldPath.lastIndexOf('/') + 1).startsWith(".") || newPath.substring(newPath.lastIndexOf('/') + 1).startsWith(".")) { server->send(403, "text/plain", "Cannot rename system files"); return; @@ -875,8 +875,6 @@ void CrossPointWebServer::handleRename() const { } } - - // WebSocket callback trampoline void CrossPointWebServer::wsEventCallback(uint8_t num, WStype_t type, uint8_t* payload, size_t length) { if (wsInstance) { diff --git a/src/network/CrossPointWebServer.h b/src/network/CrossPointWebServer.h index a2a5279a..cbd4dfd7 100644 --- a/src/network/CrossPointWebServer.h +++ b/src/network/CrossPointWebServer.h @@ -80,5 +80,4 @@ class CrossPointWebServer { void handleDelete() const; void handleMove() const; void handleRename() const; - }; diff --git a/src/util/BookCacheManager.cpp b/src/util/BookCacheManager.cpp index cd93ac01..e1cde20f 100644 --- a/src/util/BookCacheManager.cpp +++ b/src/util/BookCacheManager.cpp @@ -1,8 +1,10 @@ #include "BookCacheManager.h" -#include "StringUtils.h" + #include -#include "../RecentBooksStore.h" + #include "../CrossPointState.h" +#include "../RecentBooksStore.h" +#include "StringUtils.h" bool BookCacheManager::migrateCache(const String& oldPath, const String& newPath) { if (oldPath == newPath) return true; @@ -40,7 +42,7 @@ bool BookCacheManager::migrateCache(const String& oldPath, const String& newPath String subOldPath = oldPath + "/" + fileName; String subNewPath = newPath + "/" + fileName; - + if (!migrateCache(subOldPath, subNewPath)) { success = false; } @@ -52,7 +54,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); @@ -78,7 +80,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) { @@ -89,15 +91,13 @@ String BookCacheManager::getCachePath(const String& path) { } bool BookCacheManager::isSupportedFile(const String& path) { - return StringUtils::checkFileExtension(path, ".epub") || - StringUtils::checkFileExtension(path, ".txt") || - StringUtils::checkFileExtension(path, ".xtc") || - StringUtils::checkFileExtension(path, ".xtg") || + return StringUtils::checkFileExtension(path, ".epub") || 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 } diff --git a/src/util/BookCacheManager.h b/src/util/BookCacheManager.h index 34d1e83f..7a687f03 100644 --- a/src/util/BookCacheManager.h +++ b/src/util/BookCacheManager.h @@ -2,6 +2,7 @@ #include #include + #include class BookCacheManager { @@ -9,7 +10,7 @@ class BookCacheManager { /** * Migrate cache data for a file or directory. * If path is a directory, it recursively migrates all files within. - * + * * @param oldPath Original absolute path * @param newPath New absolute path * @return true if migration was successful or no cache existed @@ -18,7 +19,7 @@ class BookCacheManager { /** * Get the cache directory path for a given book file. - * + * * @param path Absolute path to the book file * @return Full path to the cache directory, or empty string if not a supported book type */