From 38288a47e545cce536f7f2c03f3dbea83e3f0c38 Mon Sep 17 00:00:00 2001 From: Rune Harlyk Date: Tue, 9 Jul 2024 20:04:30 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=AA=84=20Formats=20FactoryResetService?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ESP32-sveltekit/FactoryResetService.cpp | 28 +++++++------------ .../lib/ESP32-sveltekit/FactoryResetService.h | 7 ++--- 2 files changed, 13 insertions(+), 22 deletions(-) diff --git a/esp32/lib/ESP32-sveltekit/FactoryResetService.cpp b/esp32/lib/ESP32-sveltekit/FactoryResetService.cpp index 9dedd7a..49e8fe8 100644 --- a/esp32/lib/ESP32-sveltekit/FactoryResetService.cpp +++ b/esp32/lib/ESP32-sveltekit/FactoryResetService.cpp @@ -14,25 +14,19 @@ #include -FactoryResetService::FactoryResetService(PsychicHttpServer *server, - FS *fs, - SecurityManager *securityManager) : _server(server), - fs(fs), - _securityManager(securityManager) -{ -} +FactoryResetService::FactoryResetService(PsychicHttpServer *server, FS *fs, SecurityManager *securityManager) + : _server(server), fs(fs), _securityManager(securityManager) {} -void FactoryResetService::begin() -{ - _server->on(FACTORY_RESET_SERVICE_PATH, - HTTP_POST, - _securityManager->wrapRequest(std::bind(&FactoryResetService::handleRequest, this, std::placeholders::_1), AuthenticationPredicates::IS_ADMIN)); +void FactoryResetService::begin() { + _server->on( + FACTORY_RESET_SERVICE_PATH, HTTP_POST, + _securityManager->wrapRequest(std::bind(&FactoryResetService::handleRequest, this, std::placeholders::_1), + AuthenticationPredicates::IS_ADMIN)); ESP_LOGV("FactoryResetService", "Registered POST endpoint: %s", FACTORY_RESET_SERVICE_PATH); } -esp_err_t FactoryResetService::handleRequest(PsychicRequest *request) -{ +esp_err_t FactoryResetService::handleRequest(PsychicRequest *request) { request->reply(200); factoryReset(); @@ -42,12 +36,10 @@ esp_err_t FactoryResetService::handleRequest(PsychicRequest *request) /** * Delete function assumes that all files are stored flat, within the config directory. */ -void FactoryResetService::factoryReset() -{ +void FactoryResetService::factoryReset() { File root = fs->open(FS_CONFIG_DIRECTORY); File file; - while (file = root.openNextFile()) - { + while (file = root.openNextFile()) { String path = file.path(); file.close(); fs->remove(path); diff --git a/esp32/lib/ESP32-sveltekit/FactoryResetService.h b/esp32/lib/ESP32-sveltekit/FactoryResetService.h index 4701241..18b4396 100644 --- a/esp32/lib/ESP32-sveltekit/FactoryResetService.h +++ b/esp32/lib/ESP32-sveltekit/FactoryResetService.h @@ -25,17 +25,16 @@ #define FS_CONFIG_DIRECTORY "/config" #define FACTORY_RESET_SERVICE_PATH "/api/factoryReset" -class FactoryResetService -{ +class FactoryResetService { FS *fs; -public: + public: FactoryResetService(PsychicHttpServer *server, FS *fs, SecurityManager *securityManager); void begin(); void factoryReset(); -private: + private: PsychicHttpServer *_server; SecurityManager *_securityManager; esp_err_t handleRequest(PsychicRequest *request);