Adjust examples

me-no-dev · me-no-dev · commit 4f9ff7a56e68 · 2021-04-15T16:22:12.000+03:00
diff --git a/libraries/FFat/examples/FFat_Test/FFat_Test.ino b/libraries/FFat/examples/FFat_Test/FFat_Test.ino
@@ -27,7 +27,7 @@ void listDir(fs::FS &fs, const char * dirname, uint8_t levels){
             Serial.print("  DIR : ");
             Serial.println(file.name());
             if(levels){
-                listDir(fs, file.name(), levels -1);
+                listDir(fs, file.path(), levels -1);
             }
         } else {
             Serial.print("  FILE: ");
diff --git a/libraries/FFat/examples/FFat_time/FFat_time.ino b/libraries/FFat/examples/FFat_time/FFat_time.ino
@@ -31,7 +31,7 @@ void listDir(fs::FS &fs, const char * dirname, uint8_t levels){
             struct tm * tmstruct = localtime(&t);
             Serial.printf("  LAST WRITE: %d-%02d-%02d %02d:%02d:%02d\n",(tmstruct->tm_year)+1900,( tmstruct->tm_mon)+1, tmstruct->tm_mday,tmstruct->tm_hour , tmstruct->tm_min, tmstruct->tm_sec);
             if(levels){
-                listDir(fs, file.name(), levels -1);
+                listDir(fs, file.path(), levels -1);
             }
         } else {
             Serial.print("  FILE: ");
diff --git a/libraries/LITTLEFS/examples/LITTLEFS_test/LITTLEFS_test.ino b/libraries/LITTLEFS/examples/LITTLEFS_test/LITTLEFS_test.ino
@@ -32,7 +32,7 @@ void listDir(fs::FS &fs, const char * dirname, uint8_t levels){
             Serial.print("  DIR : ");
             Serial.println(file.name());
             if(levels){
-                listDir(fs, file.name(), levels -1);
+                listDir(fs, file.path(), levels -1);
             }
         } else {
             Serial.print("  FILE: ");
diff --git a/libraries/LITTLEFS/examples/LITTLEFS_time/LITTLEFS_time.ino b/libraries/LITTLEFS/examples/LITTLEFS_time/LITTLEFS_time.ino
@@ -43,7 +43,7 @@ void listDir(fs::FS &fs, const char * dirname, uint8_t levels){
             struct tm * tmstruct = localtime(&t);
             Serial.printf("  LAST WRITE: %d-%02d-%02d %02d:%02d:%02d\n",(tmstruct->tm_year)+1900,( tmstruct->tm_mon)+1, tmstruct->tm_mday,tmstruct->tm_hour , tmstruct->tm_min, tmstruct->tm_sec);
             if(levels){
-                listDir(fs, file.name(), levels -1);
+                listDir(fs, file.path(), levels -1);
             }
         } else {
             Serial.print("  FILE: ");
diff --git a/libraries/SD/examples/SD_Test/SD_Test.ino b/libraries/SD/examples/SD_Test/SD_Test.ino
@@ -35,7 +35,7 @@ void listDir(fs::FS &fs, const char * dirname, uint8_t levels){
             Serial.print("  DIR : ");
             Serial.println(file.name());
             if(levels){
-                listDir(fs, file.name(), levels -1);
+                listDir(fs, file.path(), levels -1);
             }
         } else {
             Serial.print("  FILE: ");
diff --git a/libraries/SD/examples/SD_time/SD_time.ino b/libraries/SD/examples/SD_time/SD_time.ino
@@ -47,7 +47,7 @@ void listDir(fs::FS &fs, const char * dirname, uint8_t levels){
             struct tm * tmstruct = localtime(&t);
             Serial.printf("  LAST WRITE: %d-%02d-%02d %02d:%02d:%02d\n",(tmstruct->tm_year)+1900,( tmstruct->tm_mon)+1, tmstruct->tm_mday,tmstruct->tm_hour , tmstruct->tm_min, tmstruct->tm_sec);
             if(levels){
-                listDir(fs, file.name(), levels -1);
+                listDir(fs, file.path(), levels -1);
             }
         } else {
             Serial.print("  FILE: ");
diff --git a/libraries/SD_MMC/examples/SDMMC_Test/SDMMC_Test.ino b/libraries/SD_MMC/examples/SDMMC_Test/SDMMC_Test.ino
@@ -35,7 +35,7 @@ void listDir(fs::FS &fs, const char * dirname, uint8_t levels){
             Serial.print("  DIR : ");
             Serial.println(file.name());
             if(levels){
-                listDir(fs, file.name(), levels -1);
+                listDir(fs, file.path(), levels -1);
             }
         } else {
             Serial.print("  FILE: ");
diff --git a/libraries/SD_MMC/examples/SDMMC_time/SDMMC_time.ino b/libraries/SD_MMC/examples/SDMMC_time/SDMMC_time.ino
@@ -47,7 +47,7 @@ void listDir(fs::FS &fs, const char * dirname, uint8_t levels){
             struct tm * tmstruct = localtime(&t);
             Serial.printf("  LAST WRITE: %d-%02d-%02d %02d:%02d:%02d\n",(tmstruct->tm_year)+1900,( tmstruct->tm_mon)+1, tmstruct->tm_mday,tmstruct->tm_hour , tmstruct->tm_min, tmstruct->tm_sec);
             if(levels){
-                listDir(fs, file.name(), levels -1);
+                listDir(fs, file.path(), levels -1);
             }
         } else {
             Serial.print("  FILE: ");
diff --git a/libraries/SPIFFS/examples/SPIFFS_Test/SPIFFS_Test.ino b/libraries/SPIFFS/examples/SPIFFS_Test/SPIFFS_Test.ino
@@ -25,7 +25,7 @@ void listDir(fs::FS &fs, const char * dirname, uint8_t levels){
             Serial.print("  DIR : ");
             Serial.println(file.name());
             if(levels){
-                listDir(fs, file.name(), levels -1);
+                listDir(fs, file.path(), levels -1);
             }
         } else {
             Serial.print("  FILE: ");
diff --git a/libraries/SPIFFS/examples/SPIFFS_time/SPIFFS_time.ino b/libraries/SPIFFS/examples/SPIFFS_time/SPIFFS_time.ino
@@ -31,7 +31,7 @@ void listDir(fs::FS &fs, const char * dirname, uint8_t levels){
             struct tm * tmstruct = localtime(&t);
             Serial.printf("  LAST WRITE: %d-%02d-%02d %02d:%02d:%02d\n",(tmstruct->tm_year)+1900,( tmstruct->tm_mon)+1, tmstruct->tm_mday,tmstruct->tm_hour , tmstruct->tm_min, tmstruct->tm_sec);
             if(levels){
-                listDir(fs, file.name(), levels -1);
+                listDir(fs, file.path(), levels -1);
             }
         } else {
             Serial.print("  FILE: ");
diff --git a/libraries/WebServer/examples/FSBrowser/FSBrowser.ino b/libraries/WebServer/examples/FSBrowser/FSBrowser.ino
@@ -207,7 +207,7 @@ void handleFileList() {
           output += "{\"type\":\"";
           output += (file.isDirectory()) ? "dir" : "file";
           output += "\",\"name\":\"";
-          output += String(file.name()).substring(1);
+          output += String(file.path()).substring(1);
           output += "\"}";
           file = root.openNextFile();
       }
diff --git a/libraries/WebServer/examples/SDWebServer/SDWebServer.ino b/libraries/WebServer/examples/SDWebServer/SDWebServer.ino
@@ -229,7 +229,7 @@ void printDirectory() {
     output += "{\"type\":\"";
     output += (entry.isDirectory()) ? "dir" : "file";
     output += "\",\"name\":\"";
-    output += entry.name();
+    output += entry.path();
     output += "\"";
     output += "}";
     server.sendContent(output);

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ void listDir(fs::FS &fs, const char * dirname, uint8_t levels){`
`27`	`27`	`Serial.print(" DIR : ");`
`28`	`28`	`Serial.println(file.name());`
`29`	`29`	`if(levels){`
`30`		`- listDir(fs, file.name(), levels -1);`
	`30`	`+ listDir(fs, file.path(), levels -1);`
`31`	`31`	`}`
`32`	`32`	`} else {`
`33`	`33`	`Serial.print(" FILE: ");`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ void listDir(fs::FS &fs, const char * dirname, uint8_t levels){`
`31`	`31`	`struct tm * tmstruct = localtime(&t);`
`32`	`32`	`Serial.printf(" LAST WRITE: %d-%02d-%02d %02d:%02d:%02d\n",(tmstruct->tm_year)+1900,( tmstruct->tm_mon)+1, tmstruct->tm_mday,tmstruct->tm_hour , tmstruct->tm_min, tmstruct->tm_sec);`
`33`	`33`	`if(levels){`
`34`		`- listDir(fs, file.name(), levels -1);`
	`34`	`+ listDir(fs, file.path(), levels -1);`
`35`	`35`	`}`
`36`	`36`	`} else {`
`37`	`37`	`Serial.print(" FILE: ");`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ void listDir(fs::FS &fs, const char * dirname, uint8_t levels){`
`32`	`32`	`Serial.print(" DIR : ");`
`33`	`33`	`Serial.println(file.name());`
`34`	`34`	`if(levels){`
`35`		`- listDir(fs, file.name(), levels -1);`
	`35`	`+ listDir(fs, file.path(), levels -1);`
`36`	`36`	`}`
`37`	`37`	`} else {`
`38`	`38`	`Serial.print(" FILE: ");`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ void listDir(fs::FS &fs, const char * dirname, uint8_t levels){`
`43`	`43`	`struct tm * tmstruct = localtime(&t);`
`44`	`44`	`Serial.printf(" LAST WRITE: %d-%02d-%02d %02d:%02d:%02d\n",(tmstruct->tm_year)+1900,( tmstruct->tm_mon)+1, tmstruct->tm_mday,tmstruct->tm_hour , tmstruct->tm_min, tmstruct->tm_sec);`
`45`	`45`	`if(levels){`
`46`		`- listDir(fs, file.name(), levels -1);`
	`46`	`+ listDir(fs, file.path(), levels -1);`
`47`	`47`	`}`
`48`	`48`	`} else {`
`49`	`49`	`Serial.print(" FILE: ");`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ void listDir(fs::FS &fs, const char * dirname, uint8_t levels){`
`35`	`35`	`Serial.print(" DIR : ");`
`36`	`36`	`Serial.println(file.name());`
`37`	`37`	`if(levels){`
`38`		`- listDir(fs, file.name(), levels -1);`
	`38`	`+ listDir(fs, file.path(), levels -1);`
`39`	`39`	`}`
`40`	`40`	`} else {`
`41`	`41`	`Serial.print(" FILE: ");`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ void listDir(fs::FS &fs, const char * dirname, uint8_t levels){`
`47`	`47`	`struct tm * tmstruct = localtime(&t);`
`48`	`48`	`Serial.printf(" LAST WRITE: %d-%02d-%02d %02d:%02d:%02d\n",(tmstruct->tm_year)+1900,( tmstruct->tm_mon)+1, tmstruct->tm_mday,tmstruct->tm_hour , tmstruct->tm_min, tmstruct->tm_sec);`
`49`	`49`	`if(levels){`
`50`		`- listDir(fs, file.name(), levels -1);`
	`50`	`+ listDir(fs, file.path(), levels -1);`
`51`	`51`	`}`
`52`	`52`	`} else {`
`53`	`53`	`Serial.print(" FILE: ");`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ void listDir(fs::FS &fs, const char * dirname, uint8_t levels){`
`25`	`25`	`Serial.print(" DIR : ");`
`26`	`26`	`Serial.println(file.name());`
`27`	`27`	`if(levels){`
`28`		`- listDir(fs, file.name(), levels -1);`
	`28`	`+ listDir(fs, file.path(), levels -1);`
`29`	`29`	`}`
`30`	`30`	`} else {`
`31`	`31`	`Serial.print(" FILE: ");`
Original file line number	Diff line number	Diff line change
`@@ -207,7 +207,7 @@ void handleFileList() {`
`207`	`207`	`output += "{\"type\":\"";`
`208`	`208`	`output += (file.isDirectory()) ? "dir" : "file";`
`209`	`209`	`output += "\",\"name\":\"";`
`210`		`- output += String(file.name()).substring(1);`
	`210`	`+ output += String(file.path()).substring(1);`
`211`	`211`	`output += "\"}";`
`212`	`212`	`file = root.openNextFile();`
`213`	`213`	`}`