up

holgerlembke · Feb 23, 2025 · 1f564b2 · 1f564b2
1 parent 06b3b87
commit 1f564b2
Show file tree

Hide file tree

Showing 6 changed files with 101 additions and 22 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,4 +10,5 @@ notizen.txt
 *.cmd
 .vscode
 makeESPFMfGKdeflate
+examplesCopy
 !postbuild.cmd
diff --git a/examples/advanced/ESPFMfGKdropin.ino b/examples/advanced/ESPFMfGKdropin.ino
@@ -36,6 +36,30 @@ void addFileSystems(void) {
 }
 
 uint32_t checkFileFlags(fs::FS &fs, String filename, uint32_t flags) {
+  // Show file/path in Lists 
+  // filenames start without "/", pathnames start with "/"
+  if (flags & (ESPFMfGK::flagCheckIsFilename | ESPFMfGK::flagCheckIsPathname)) {
+    /** /
+    Serial.print("flagCheckIsFilename || flagCheckIsPathname check: ");
+    Serial.println(filename);
+    /**/
+    if (flags | ESPFMfGK::flagCheckIsFilename) {
+      if (filename.startsWith(".")) {
+        // Serial.println(filename + " flagIsNotVisible");
+        return ESPFMfGK::flagIsNotVisible;
+      }
+    }
+    /*
+       this will catch a pathname like /.test, but *not* /foo/.test
+       so you might use .indexOf()
+    */
+    if (flags | ESPFMfGK::flagCheckIsPathname) {
+      if (filename.startsWith("/.")) {
+        // Serial.println(filename + " flagIsNotVisible");
+        return ESPFMfGK::flagIsNotVisible;
+      }
+    }
+  }
 
   // this will hide system files (in my world, system files start with a dot)
   if (filename.startsWith("/.")) {

diff --git a/examples/simple/ESPFMfGKdropin.ino b/examples/simple/ESPFMfGKdropin.ino
@@ -36,6 +36,31 @@ void addFileSystems(void) {
 }
 
 uint32_t checkFileFlags(fs::FS &fs, String filename, uint32_t flags) {
+  // Show file/path in Lists 
+  // filenames start without "/", pathnames start with "/"
+  if (flags & (ESPFMfGK::flagCheckIsFilename | ESPFMfGK::flagCheckIsPathname)) {
+    /** /
+    Serial.print("flagCheckIsFilename || flagCheckIsPathname check: ");
+    Serial.println(filename);
+    /**/
+    if (flags | ESPFMfGK::flagCheckIsFilename) {
+      if (filename.startsWith(".")) {
+        // Serial.println(filename + " flagIsNotVisible");
+        return ESPFMfGK::flagIsNotVisible;
+      }
+    }
+    /*
+       this will catch a pathname like /.test, but *not* /foo/.test
+       so you might use .indexOf()
+    */
+    if (flags | ESPFMfGK::flagCheckIsPathname) {
+      if (filename.startsWith("/.")) {
+        // Serial.println(filename + " flagIsNotVisible");
+        return ESPFMfGK::flagIsNotVisible;
+      }
+    }
+  }
+
   // Checks if target file name is valid for action. This will simply allow everything by returning the queried flag
   if (flags & ESPFMfGK::flagIsValidAction) {
     return flags & (~ESPFMfGK::flagIsValidAction);

diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=ESP32 File Manager for Generation Klick ESPFMfGK
-version=2.0.13
+version=2.0.14
 author=Holger Lembke
 maintainer=Holger Lembke <lembke@gmail.com>
 sentence=Manage your ES32 file system content with a simple web based interface

diff --git a/src/ESPFMfGK.cpp b/src/ESPFMfGK.cpp
@@ -437,6 +437,7 @@ int ESPFMfGK::getFileSystemIndex(bool uselastFileSystemIndex)
 */
 
 //*****************************************************************************************************
+// flat view
 void ESPFMfGK::recurseFolderList(String foldername, int maxtiefe, int tiefe)
 {
   int fsi = getFileSystemIndex(false);
@@ -448,29 +449,37 @@ void ESPFMfGK::recurseFolderList(String foldername, int maxtiefe, int tiefe)
   {
     if (file.isDirectory())
     {
-      if (!(String(file.path()).startsWith(svi)))
+      uint32_t flags = ~0;
+      // Show this folder?
+      if (checkFileFlags != NULL)
       {
-        /** /
-        Serial.print("Pfad: ");
-        Serial.println(String(file.path()));
-        Serial.print("Name: ");
-        Serial.println(String(file.name()));
-        /**/
-        uint32_t flags = ~0;
-        if (checkFileFlags != NULL)
+        flags = checkFileFlags(*fsinfo[fsi].filesystem, String(file.path()) + "/", flagCheckIsPathname);
+      }
+      if (!(flags & ESPFMfGK::flagIsNotVisible))
+      {
+        if (!(String(file.path()).startsWith(svi)))
         {
-          flags = checkFileFlags(*fsinfo[fsi].filesystem, String(file.path()) + "/", 0);
+          /** /
+          Serial.print("Pfad: ");
+          Serial.println(String(file.path()));
+          Serial.print("Name: ");
+          Serial.println(String(file.name()));
+          /**/
+          if (checkFileFlags != NULL)
+          {
+            flags = checkFileFlags(*fsinfo[fsi].filesystem, String(file.path()) + "/", flagCheckIsPathname);
+          }
+          if (!(flags & ESPFMfGK::flagIsNotVisible))
+          {
+            fileManager->sendContent(String(tiefe) + ":" + DeUmlautFilename(String(file.path())));
+            fileManager->sendContent(itemtrenner); // 0
+          }
         }
-        if (!(flags & ESPFMfGK::flagIsNotVisible))
+        if (tiefe < maxtiefe)
         {
-          fileManager->sendContent(String(tiefe) + ":" + DeUmlautFilename(String(file.path())));
-          fileManager->sendContent(itemtrenner); // 0
+          recurseFolderList(file.path(), maxtiefe, tiefe + 1);
         }
       }
-      if (tiefe < maxtiefe)
-      {
-        recurseFolderList(file.path(), maxtiefe, tiefe + 1);
-      }
     }
     file = root.openNextFile();
   }
@@ -550,9 +559,16 @@ void ESPFMfGK::recurseFolder(String foldername, bool flatview, int maxtiefe, boo
   {
     if (file.isDirectory())
     {
-      if (flatview)
+      uint32_t flags = ~0;
+      if (checkFileFlags != NULL)
       {
-        recurseFolder(file.path(), flatview, maxtiefe, false, linecounter);
+        flags = checkFileFlags(*fsinfo[fsi].filesystem, String(file.path()) + "/", flagCheckIsPathname);
+      }
+      if (!(flags & ESPFMfGK::flagIsNotVisible)) {
+        if (flatview)
+        {
+          recurseFolder(file.path(), flatview, maxtiefe, false, linecounter);
+        }
       }
     }
     else
@@ -569,7 +585,7 @@ void ESPFMfGK::recurseFolder(String foldername, bool flatview, int maxtiefe, boo
         uint32_t flags = ~0;
         if (checkFileFlags != NULL)
         {
-          flags = checkFileFlags(*fsinfo[fsi].filesystem, file.name(), 0);
+          flags = checkFileFlags(*fsinfo[fsi].filesystem, file.name(), flagCheckIsFilename);
         }
         if (!gzipperexists)
         {

diff --git a/src/ESPFMfGK.h b/src/ESPFMfGK.h
@@ -15,6 +15,10 @@ das funktioniert nicht, weil der / nicht mitgeliefert wird. wie sieht das
     return ESPFMfGK::flagIsNotVisible;
   }
 
+schön wäre eine Funktion wie...
+if (Pathname.startsWith("/.")) ... 
+...um die entsprechenden Ordner ebenfalls auszublenden?!  
+
   Hi, thanks for your great work.
 I have a few suggestions:
 
@@ -31,7 +35,12 @@ tab im editor zum echten tab umwandeln.
 
 
   Changes
-    V2.0.7
+   V2.0.8
+    + fixed some stuff around displaying/not displaying files+folders,
+      adding two flags flagCheckIsFilename and flagCheckIsPathname 
+     + Arduino-release V2.0.14
+
+   V2.0.7
      + Fix: another checkFileFlags() error...
      + add "SOC_SDMMC_HOST_SUPPORTED" for devices without this support
      + Arduino-release V2.0.13
@@ -171,6 +180,10 @@ class ESPFMfGK
   // allowed to create new files
   const static uint32_t flagCanCreateNew =  1 << 11;
 
+  //checking call is for a filename/pathname  
+  const static uint32_t flagCheckIsFilename =  1 << 12;
+  const static uint32_t flagCheckIsPathname =  1 << 13;
+
   ESPxWebCallbackFlags_t checkFileFlags = NULL;
   ESPxWebCallbackURL_t checkURLs = NULL;
   HtmlIncludesCallback_t HtmlIncludesCallback = NULL;