Merge pull request #237 from Lamnxzp/fix

Fixed: BIN files from being displayed even if they are not included in the allowed extensions.
pr3y · Sep 2, 2024 · ec83edc · ec83edc
2 parents 1156d17 + ba8d993
commit ec83edc
Showing 1 changed file with 3 additions and 9 deletions.
diff --git a/src/core/sd_functions.cpp b/src/core/sd_functions.cpp
@@ -460,6 +460,8 @@ void clearFileList(String list[][3]) {
     }
 }
 bool checkExt(String ext, String pattern) {
+    ext.toUpperCase();
+    pattern.toUpperCase();
     if (ext == pattern) return true;
 
     char charArray[pattern.length() + 1];
@@ -473,7 +475,6 @@ bool checkExt(String ext, String pattern) {
 ** Description:   sort files for name
 ***************************************************************************************/
 void readFs(FS fs, String folder, String result[][3], String allowed_ext) {
-
     int allFilesCount = 0;
     clearFileList(result);
 
@@ -488,14 +489,7 @@ void readFs(FS fs, String folder, String result[][3], String allowed_ext) {
         String fileName = file2.name();
         if (!file2.isDirectory()) {
             String ext = fileName.substring(fileName.lastIndexOf(".") + 1);
-            ext.toUpperCase();
-            if (ext.equals("BIN")) {
-              result[allFilesCount][0] = fileName.substring(fileName.lastIndexOf("/") + 1);
-              result[allFilesCount][1] = file2.path();
-              result[allFilesCount][2] = "file";
-              allFilesCount++;
-            }
-            else if(allowed_ext=="*" || checkExt(ext, allowed_ext)) {
+            if (allowed_ext=="*" || checkExt(ext, allowed_ext)) {
               result[allFilesCount][0] = fileName.substring(fileName.lastIndexOf("/") + 1);
               result[allFilesCount][1] = file2.path();
               result[allFilesCount][2] = "file";