Darkages/SpotMicroESP32-Leika
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🪄 Formats FileExplorer

Browse Source
This commit is contained in:
Rune Harlyk
2024-07-09 20:06:49 +02:00
committed by Rune Harlyk
parent 181788ee46
commit 6a6fb74229
1 changed files with 16 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esp32/lib/ESP32-sveltekit/FileExplorerService.h
+15 -29
View File
@@ -8,21 +8,18 @@
#define FILE_EXPLORER_SERVICE_PATH "/api/files" #define FILE_EXPLORER_SERVICE_PATH "/api/files"
#define FILE_EXPLORER_DELETE_SERVICE_PATH "/api/files/delete" #define FILE_EXPLORER_DELETE_SERVICE_PATH "/api/files/delete"
class FileExplorer class FileExplorer {
{
public: public:
FileExplorer(PsychicHttpServer *server, SecurityManager *securityManager) FileExplorer(PsychicHttpServer *server, SecurityManager *securityManager)
: _server(server), _securityManager(securityManager) : _server(server), _securityManager(securityManager) {}
{
}
void begin() void begin() {
{
_server->on(FILE_EXPLORER_SERVICE_PATH, HTTP_GET, _server->on(FILE_EXPLORER_SERVICE_PATH, HTTP_GET,
_securityManager->wrapRequest(std::bind(&FileExplorer::explore, this, std::placeholders::_1), _securityManager->wrapRequest(std::bind(&FileExplorer::explore, this, std::placeholders::_1),
AuthenticationPredicates::IS_AUTHENTICATED)); AuthenticationPredicates::IS_AUTHENTICATED));
_server->on(FILE_EXPLORER_DELETE_SERVICE_PATH, HTTP_POST, _server->on(FILE_EXPLORER_DELETE_SERVICE_PATH, HTTP_POST,
_securityManager->wrapCallback(std::bind(&FileExplorer::deleteFile, this, std::placeholders::_1, std::placeholders::_2), _securityManager->wrapCallback(
std::bind(&FileExplorer::deleteFile, this, std::placeholders::_1, std::placeholders::_2),
AuthenticationPredicates::IS_AUTHENTICATED)); AuthenticationPredicates::IS_AUTHENTICATED));
ESP_LOGV("APStatus", "Registered GET endpoint: %s", FILE_EXPLORER_SERVICE_PATH); ESP_LOGV("APStatus", "Registered GET endpoint: %s", FILE_EXPLORER_SERVICE_PATH);
@@ -32,15 +29,12 @@ class FileExplorer
PsychicHttpServer *_server; PsychicHttpServer *_server;
SecurityManager *_securityManager; SecurityManager *_securityManager;
esp_err_t explore(PsychicRequest *request) esp_err_t explore(PsychicRequest *request) {
{
return request->reply(200, "application/json", listFiles("/").c_str()); return request->reply(200, "application/json", listFiles("/").c_str());
} }
esp_err_t deleteFile(PsychicRequest *request, JsonVariant &json) esp_err_t deleteFile(PsychicRequest *request, JsonVariant &json) {
{ if (json.is<JsonObject>()) {
if (json.is<JsonObject>())
{
String filename = json["file"]; String filename = json["file"];
ESP_LOGI("FileExplorer", "Deleting file: %s", filename.c_str()); ESP_LOGI("FileExplorer", "Deleting file: %s", filename.c_str());
return ESPFS.remove(filename.c_str()) ? request->reply(200) : request->reply(500); return ESPFS.remove(filename.c_str()) ? request->reply(200) : request->reply(500);
@@ -48,37 +42,29 @@ class FileExplorer
return request->reply(400); return request->reply(400);
} }
String listFiles(const String &directory, bool isRoot = true) String listFiles(const String &directory, bool isRoot = true) {
{
File root = ESPFS.open(directory.startsWith("/") ? directory : "/" + directory); File root = ESPFS.open(directory.startsWith("/") ? directory : "/" + directory);
if (!root.isDirectory()) if (!root.isDirectory()) {
{
return ""; return "";
} }
File file = root.openNextFile(); File file = root.openNextFile();
String output = isRoot ? "{ \"root\": {" : "{"; String output = isRoot ? "{ \"root\": {" : "{";
while (file) while (file) {
{ if (file.isDirectory()) {
if (file.isDirectory())
{
output += "\"" + String(file.name()) + "\": " + listFiles(file.name(), false) + ", "; output += "\"" + String(file.name()) + "\": " + listFiles(file.name(), false) + ", ";
} } else {
else
{
output += "\"" + String(file.name()) + "\": " + String(file.size()) + ", "; output += "\"" + String(file.name()) + "\": " + String(file.size()) + ", ";
} }
file = root.openNextFile(); file = root.openNextFile();
} }
if (output.endsWith(", ")) if (output.endsWith(", ")) {
{
output.remove(output.length() - 2); output.remove(output.length() - 2);
} }
output += "}"; output += "}";
if (isRoot) if (isRoot) {
{
output += "}"; output += "}";
} }
return output; return output;