From 85289144bcad7ce59c8d66f716f07627e448d5f9 Mon Sep 17 00:00:00 2001
From: biver <batata@mail.ru>
Date: Thu, 19 May 2022 00:14:53 +0300
Subject: [PATCH] =?UTF-8?q?=D0=92=D0=BA=D0=BB=D1=8E=D1=87=D0=B0=D0=B5?=
 =?UTF-8?q?=D0=BC=20=D1=82=D0=B5=D1=85=D0=BD=D0=B8=D1=87=D0=B5=D1=81=D0=BA?=
 =?UTF-8?q?=D0=B8=D0=B9=20=D1=80=D0=B5=D0=B4=D0=B0=D0=BA=D1=82=D0=BE=D1=80?=
 =?UTF-8?q?=20=D1=84=D0=B0=D0=B9=D0=BB=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data_svelte/dev_conf.txt |   0
 data_svelte/edit.htm.gz  | Bin 0 -> 5286 bytes
 include/StandWebServer.h |   4 +--
 src/StandWebServer.cpp   |  63 +++++++++++++++++++++++++--------------
 4 files changed, 43 insertions(+), 24 deletions(-)
 create mode 100644 data_svelte/dev_conf.txt
 create mode 100644 data_svelte/edit.htm.gz

diff --git a/data_svelte/dev_conf.txt b/data_svelte/dev_conf.txt
new file mode 100644
index 00000000..e69de29b
diff --git a/data_svelte/edit.htm.gz b/data_svelte/edit.htm.gz
new file mode 100644
index 0000000000000000000000000000000000000000..d41d10c1c56f308ad3cac07e98993703426b577d
GIT binary patch
literal 5286
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

literal 0
HcmV?d00001

diff --git a/include/StandWebServer.h b/include/StandWebServer.h
index 230a712b..29ce3b26 100644
--- a/include/StandWebServer.h
+++ b/include/StandWebServer.h
@@ -5,10 +5,10 @@
 extern void standWebServerInit();
 extern bool handleFileRead(String path);
 extern String getContentType(String filename);
-#ifdef REST_FILE_OPERATIONS
+//#ifdef REST_FILE_OPERATIONS
 extern void handleFileUpload();
 extern void handleFileDelete();
 extern void handleFileCreate();
 extern void handleFileList();
-#endif
+//#endif
 #endif
diff --git a/src/StandWebServer.cpp b/src/StandWebServer.cpp
index 48192ec4..b13c0996 100644
--- a/src/StandWebServer.cpp
+++ b/src/StandWebServer.cpp
@@ -48,36 +48,53 @@ void standWebServerInit() {
     //  Запускаем HTTP сервер
     HTTP.begin();
 
-#ifdef REST_FILE_OPERATIONS
-    SPIFFS.begin();
-    {
-        Dir dir = SPIFFS.openDir("/");
-        while (dir.next()) {
-            String fileName = dir.fileName();
-            size_t fileSize = dir.fileSize();
-        }
-    }
+//#ifdef REST_FILE_OPERATIONS
+    // SPIFFS.begin();
+    // {
+    //     Dir dir = SPIFFS.openDir("/");
+    //     while (dir.next()) {
+    //         String fileName = dir.fileName();
+    //         size_t fileSize = dir.fileSize();
+    //     }
+    // }
     // HTTP страницы для работы с FFS
+    
     // list directory
     HTTP.on("/list", HTTP_GET, handleFileList);
+    
     //загрузка редактора editor
     HTTP.on("/edit", HTTP_GET, []() {
-        if (!handleFileRead("/edit.htm")) HTTP.send(404, "text/plain", "FileNotFound");
+        if (!HTTP.args()) {
+            if (!handleFileRead("/edit.htm")) HTTP.send(404, "text/plain", "FileNotFound");
+        }
+
+        if (HTTP.hasArg("list")) {
+           handleFileList();
+        }
+
+        if (HTTP.hasArg("edit")) {
+           if (!handleFileRead(HTTP.arg("edit"))) HTTP.send(404, "text/plain", "FileNotFound");
+        }
+
+        if (HTTP.hasArg("download")) {
+           if (!handleFileRead(HTTP.arg("download"))) HTTP.send(404, "text/plain", "FileNotFound");
+        }
     });
+    
     //Создание файла
     HTTP.on("/edit", HTTP_PUT, handleFileCreate);
+    
     //Удаление файла
     HTTP.on("/edit", HTTP_DELETE, handleFileDelete);
-    // first callback is called after the request has ended with all parsed arguments
-    // second callback handles file uploads at that location
-    HTTP.on(
-        "/edit", HTTP_POST, []() {
+    
+    //Изменение файла
+    HTTP.on("/edit", HTTP_POST, []() {
             HTTP.send(200, "text/plain", "");
         },
         handleFileUpload);
-#endif
+//#endif
+    
     // called when the url is not defined here
-    // use it to load content from SPIFFS
     HTTP.onNotFound([]() {
         if (!handleFileRead(HTTP.uri()))
             HTTP.send(404, "text/plain", "FileNotFound");
@@ -92,6 +109,8 @@ bool handleFileRead(String path) {
         if (FileFS.exists(pathWithGz))
             path += ".gz";
         File file = FileFS.open(path, "r");
+        if (contentType == "application/octet-stream") 
+            HTTP.sendHeader("Content-Disposition", "attachment;filename=" + (String)file.name());
         HTTP.streamFile(file, contentType);
         file.close();
         return true;
@@ -131,7 +150,7 @@ String getContentType(String filename) {
     return "text/plain";
 }
 
-#ifdef REST_FILE_OPERATIONS
+//#ifdef REST_FILE_OPERATIONS
 // Здесь функции для работы с файловой системой
 void handleFileUpload() {
     if (HTTP.uri() != "/edit") return;
@@ -181,27 +200,27 @@ void handleFileCreate() {
 }
 
 void handleFileList() {
-    if (!HTTP.hasArg("dir")) {
+    if (!HTTP.hasArg("list")) {
         HTTP.send(500, "text/plain", "BAD ARGS");
         return;
     }
-    String path = HTTP.arg("dir");
+    String path = HTTP.arg("list");
     Dir dir = FileFS.openDir(path);
     path = String();
     String output = "[";
     while (dir.next()) {
         File entry = dir.openFile("r");
         if (output != "[") output += ',';
-        bool isDir = false;
+        bool isDir = dir.isDirectory();
         output += "{\"type\":\"";
         output += (isDir) ? "dir" : "file";
         output += "\",\"name\":\"";
-        output += String(entry.name()).substring(1);
+        output += String(entry.name());
         output += "\"}";
         entry.close();
     }
     output += "]";
     HTTP.send(200, "text/json", output);
 }
-#endif
+//#endif
 #endif