iotmanager/IoTManager
1
0
Fork 0
mirror of https://github.com/IoTManagerProject/IoTManager.git synced 2026-03-26 22:22:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Исправляем ошибку в алгоритме чтения директории. openNextFile() возвращает файл.

Browse Source
This commit is contained in:
biver
2021-12-03 11:18:48 +03:00
parent f668b5783e
commit 2b1ab1df50
1 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/FSEditor.cpp
View File

@@ -184,21 +184,22 @@ void FSEditor::getDirList(const String &path, String &output) {
}
#else
void FSEditor::getDirList(const String &path, String &output) {
auto dir = _fs.open(path, FILE_READ);
File dir = _fs.open(path.c_str(), FILE_READ);
dir.rewindDirectory();
while (dir.openNextFile()) {
String fname = dir.name();
if (!path.endsWith("/") && !fname.startsWith("/")) {
fname = "/" + fname;
}
fname = path + fname;
if (isExcluded(_fs, fname.c_str())) {
continue;
}
if (dir.isDirectory()) {
getDirList(fname, output);
continue;
}
File file;
while (file = dir.openNextFile()) {
String fname = file.name();
//if (!path.endsWith("/") && !fname.startsWith("/")) {
// fname = "/" + fname;
//}
//fname = path + fname;
//if (isExcluded(_fs, fname.c_str())) {
// continue;
//}
//if (dir.isDirectory()) {
// getDirList(fname, output);
// continue;
//}
if (output != "[") output += ',';
char buf[128];
sprintf(buf, "{\"type\":\"file\",\"name\":\"%s\",\"size\":%d}", fname.c_str(), dir.size());