Fix rmdir does not remove not empty directory

Remove SDFat V1 support as not necessary now have SDFat 2.x
Remove SPIFFS esp8266 support as now removed from core
Bump version
Remove outdated test scripts

Author: luc-github

.vscode/settings.json

@@ -10,7 +10,8 @@
         "unordered_set": "cpp",
         "vector": "cpp",
         "string_view": "cpp",
-        "initializer_list": "cpp"
+        "initializer_list": "cpp",
+        "typeinfo": "cpp"
     },
     "cmake.configureOnOpen": false
 }

esp3d/configuration.h

@@ -245,7 +245,6 @@
 /* SD card library
 * ESP_SD_NATIVE //esp32 / esp8266
 * ESP_SDIO      //esp32 only
-* ESP_SDFAT     //esp8266  / esp32
 * ESP_SDFAT2    //esp8266  / esp32
 */
 //#define SD_DEVICE ESP_SDFAT2

esp3d/src/include/defines.h

@@ -200,8 +200,7 @@
 //SD READER FS type supported
 #define ESP_SD_NATIVE               1
 #define ESP_SDIO                    2
-#define ESP_SDFAT                   3
-#define ESP_SDFAT2                  4
+#define ESP_SDFAT2                  3
 
 //SDIO Mode
 #define SD_ONE_BIT_MODE             1

esp3d/src/include/version.h

@@ -22,7 +22,7 @@
 #define _VERSION_ESP3D_H
 
 //version and sources location
-#define FW_VERSION "3.0.0.a208"
+#define FW_VERSION "3.0.0.a209"
 #define REPOSITORY "https://github.com/luc-github/ESP3D/tree/3.0"
 
 #endif //_VERSION_ESP3D_H

esp3d/src/modules/filesystem/flash/fat_esp32_filesystem.cpp

@@ -143,35 +143,39 @@ bool ESP_FileSystem::mkdir(const char *path)
 bool ESP_FileSystem::rmdir(const char *path)
 {
     String p = path;
-    if(p[0]!='/') {
-        p="/"+p;
+    if (!p.startsWith("/")) {
+        p = '/'+p;
     }
-    if (p[p.length()-1] == '/') {
-        if (p!="/") {
+    if (p!= "/") {
+        if (p.endsWith("/")) {
             p.remove(p.length()-1);
         }
     }
-
     if (!exists(p.c_str())) {
         return false;
     }
     bool res = true;
     std::stack <String > pathlist;
     pathlist.push(p);
-    while (pathlist.size() > 0) {
+    while (pathlist.size() > 0 && res) {
         File dir = FFat.open(pathlist.top().c_str());
         File f = dir.openNextFile();
         bool candelete = true;
-        while (f) {
+        while (f && res) {
             if (f.isDirectory()) {
                 candelete = false;
-                String newdir = f.name();
+                String newdir = pathlist.top()+ '/';
+                newdir+= f.name();
                 pathlist.push(newdir);
                 f.close();
                 f = File();
             } else {
-                FFat.remove(f.name());
+                String filepath = pathlist.top()+ '/';
+                filepath+= f.name();
                 f.close();
+                if (!FFat.remove(filepath.c_str())) {
+                    res = false;
+                }
                 f = dir.openNextFile();
             }
         }

esp3d/src/modules/filesystem/flash/littlefs_esp32_filesystem.cpp

@@ -150,35 +150,39 @@ bool ESP_FileSystem::mkdir(const char *path)
 bool ESP_FileSystem::rmdir(const char *path)
 {
     String p = path;
-    if(p[0]!='/') {
-        p="/"+p;
+    if (!p.startsWith("/")) {
+        p = '/'+p;
     }
-    if (p[p.length()-1] == '/') {
-        if (p!="/") {
+    if (p!= "/") {
+        if (p.endsWith("/")) {
             p.remove(p.length()-1);
         }
     }
-
     if (!exists(p.c_str())) {
         return false;
     }
     bool res = true;
     std::stack <String> pathlist;
     pathlist.push(p);
-    while (pathlist.size() > 0) {
+    while (pathlist.size() > 0 && res) {
         File dir = LittleFS.open(pathlist.top().c_str());
         File f = dir.openNextFile();
         bool candelete = true;
-        while (f) {
+        while (f && res) {
             if (f.isDirectory()) {
                 candelete = false;
-                String newdir = f.name();
+                String newdir = pathlist.top()+ '/';
+                newdir+= f.name();
                 pathlist.push(newdir);
                 f.close();
                 f = File();
             } else {
-                LittleFS.remove(f.name());
+                String filepath = pathlist.top()+ '/';
+                filepath+= f.name();
                 f.close();
+                if (!LittleFS.remove(filepath.c_str())) {
+                    res = false;
+                }
                 f = dir.openNextFile();
             }
         }

esp3d/src/modules/filesystem/flash/littlefs_esp8266_filesystem .cpp

@@ -153,46 +153,40 @@ bool ESP_FileSystem::mkdir(const char *path)
 
 bool ESP_FileSystem::rmdir(const char *path)
 {
-    if (!exists(path)) {
+    String p = path;
+    if (!p.endsWith("/")) {
+        p+= '/';
+    }
+    if (!p.startsWith("/")) {
+        p = '/'+p;
+    }
+    if (!exists(p.c_str())) {
         return false;
     }
     bool res = true;
     std::stack <String> pathlist;
-    String spath = path;
-    spath.trim();
-    if (spath[spath.length()-1] != '/') {
-        spath+="/";
-    }
-    if (spath[0] != '/') {
-        spath ="/" + spath;
-    }
-    pathlist.push(spath);
+    pathlist.push(p);
     while (pathlist.size() > 0) {
-        spath=pathlist.top();
+
         bool candelete = true;
-        if (LittleFS.exists(spath.c_str()))  {
-            Dir dir = LittleFS.openDir(pathlist.top().c_str());
-            while (dir.next()) {
-                if (dir.isDirectory()) {
-                    candelete = false;
-                    String newdir = pathlist.top() + dir.fileName() + "/";
-                    pathlist.push(newdir);
-                } else {
-                    log_esp3d("remove %s", dir.fileName().c_str());
-                    String s = spath + dir.fileName();
-                    LittleFS.remove(s);
-                }
+        Dir dir = LittleFS.openDir(pathlist.top().c_str());
+        while (dir.next()) {
+            if (dir.isDirectory()) {
+                candelete = false;
+                String newdir = pathlist.top() + dir.fileName() + "/";
+                pathlist.push(newdir);
+            } else {
+                String filepath = pathlist.top()+ '/';
+                filepath+= dir.fileName();
+                log_esp3d("remove %s", filepath.c_str());
+                LittleFS.remove(filepath.c_str());
             }
         }
         if (candelete) {
-            if (spath !="/") {
-                if (spath[spath.length()-1] == '/') {
-                    spath.remove(spath.length()-1);
-                }
-                if (LittleFS.exists(spath.c_str()))  {
-                    res = LittleFS.rmdir(spath.c_str());
+            if (pathlist.top() !="/") {
+                if (LittleFS.exists(pathlist.top().c_str())) {
+                    res = LittleFS.rmdir(pathlist.top().c_str());
                 }
-                log_esp3d("rmdir %s %d", spath.c_str(), res);
             }
             pathlist.pop();
         }

esp3d/src/modules/filesystem/flash/spiffs_esp32_filesystem.cpp

@@ -168,11 +168,11 @@ bool ESP_FileSystem::rmdir(const char *path)
 {
     String spath = path;
     spath.trim();
-    if(spath[0]!='/') {
-        spath="/"+spath;
+    if (!spath.startsWith("/")) {
+        spath = '/'+spath;
     }
-    if (spath[spath.length()-1] == '/') {
-        if (spath!="/") {
+    if (spath!= "/") {
+        if (spath.endsWith("/")) {
             spath.remove(spath.length()-1);
         }
     }