From 064e1b10ff501ced2e2005f23d3b29380a3bac7e Mon Sep 17 00:00:00 2001
From: Dmitry Borisenko <49808844+DmitryBorisenko33@users.noreply.github.com>
Date: Sat, 27 Aug 2022 02:45:02 +0200
Subject: [PATCH] =?UTF-8?q?=D1=84=D1=83=D0=BD=D0=BA=D1=86=D0=B8=D0=B8=20?=
 =?UTF-8?q?=D1=81=D0=BF=D0=B8=D1=81=D0=BA=D0=B0=20=D1=84=D0=B0=D0=B9=D0=BB?=
 =?UTF-8?q?=D0=BE=D0=B2=20=D0=BE=D1=82=20=D0=A1=D0=B5=D1=80=D0=B5=D0=B3?=
 =?UTF-8?q?=D0=B8=20=D0=A2=D1=80=D0=B5=D1=82=D1=8C=D1=8F=D0=BA=D0=BE=D0=B2?=
 =?UTF-8?q?=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 include/utils/FileUtils.h |  4 +++-
 src/Main.cpp              | 24 +++++++++++---------
 src/utils/FileUtils.cpp   | 47 ++++++++++++++++++++++++++++++++++++++-
 3 files changed, 62 insertions(+), 13 deletions(-)

diff --git a/include/utils/FileUtils.h b/include/utils/FileUtils.h
index 1c4e8918..6a528fe6 100644
--- a/include/utils/FileUtils.h
+++ b/include/utils/FileUtils.h
@@ -15,4 +15,6 @@ void removeFile(const String& filename);
 void cleanDirectory(String path);
 void saveDataDB(String id, String data);
 String readDataDB(String id);
-extern void onFlashWrite();
\ No newline at end of file
+extern void onFlashWrite();
+
+String FileList(String path);
\ No newline at end of file
diff --git a/src/Main.cpp b/src/Main.cpp
index 472b4499..437a4f6f 100644
--- a/src/Main.cpp
+++ b/src/Main.cpp
@@ -73,17 +73,19 @@ void setup() {
     Serial.println("-------test start--------");
     //=======проверка очереди из структур=================
 
-    myDB = new IoTDB;
-    QueueItems myItem;
-    myItem.myword = "word1";
-    myDB->push(myItem);
-    myItem.myword = "word2";
-    myDB->push(myItem);
-    myItem.myword = "word3";
-    myDB->push(myItem);
-    Serial.println(myDB->front().myword);
-    Serial.println(myDB->front().myword);
-    Serial.println(myDB->front().myword);
+    // myDB = new IoTDB;
+    // QueueItems myItem;
+    // myItem.myword = "word1";
+    // myDB->push(myItem);
+    // myItem.myword = "word2";
+    // myDB->push(myItem);
+    // myItem.myword = "word3";
+    // myDB->push(myItem);
+    // Serial.println(myDB->front().myword);
+    // Serial.println(myDB->front().myword);
+    // Serial.println(myDB->front().myword);
+
+    Serial.println(FileList("lg"));
 
     Serial.println("--------test end---------");
 
diff --git a/src/utils/FileUtils.cpp b/src/utils/FileUtils.cpp
index d6076261..dfdfa4f7 100644
--- a/src/utils/FileUtils.cpp
+++ b/src/utils/FileUtils.cpp
@@ -215,4 +215,49 @@ String readDataDB(String id) {
 void onFlashWrite() {
     flashWriteNumber++;
     // SerialPrint(F("->"), F("FS"), F("write data on flash"));
-}
\ No newline at end of file
+}
+
+// Создаем список файлов каталога, функции от Сергея Третьякова
+#if defined(ESP8266)
+String FileList(String path) {
+    Dir dir = FileFS.openDir(path);
+    path = String();
+    String output = "[";
+    while (dir.next()) {
+        File entry = dir.openFile("r");
+        if (output != "[") output += ',';
+        bool isDir = false;
+        output += "{\"type\":\"";
+        output += (isDir) ? "dir" : "file";
+        output += "\",\"name\":\"";
+        output += String(entry.name()).substring(1);
+        output += "\"}";
+        entry.close();
+    }
+    output += "]";
+    return output;
+}
+#else
+String FileList(String path) {
+    File root = FileFS.open(path);
+    path = String();
+
+    String output = "[";
+    if (root.isDirectory()) {
+        File file = root.openNextFile();
+        while (file) {
+            if (output != "[") {
+                output += ',';
+            }
+            output += "{\"type\":\"";
+            output += (file.isDirectory()) ? "dir" : "file";
+            output += "\",\"name\":\"";
+            output += String(file.path()).substring(1);
+            output += "\"}";
+            file = root.openNextFile();
+        }
+    }
+    output += "]";
+    return output;
+}
+#endif
\ No newline at end of file