piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

fix(ui): Ignore hidden file when iterating SD card contents (#2925)

Browse Source 
* Ignore hidden file when iterating SD card contents.

* Fix compile error.
This commit is contained in:
philmoz
2022-12-23 11:18:00 +10:00
committed by GitHub
parent f8f2258a79
commit 919b83af42
6 changed files with 23 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/colorlcd/file_browser.cpp
+2 -2
View File
@@ -145,8 +145,8 @@ static int scan_files(std::list<std::string>& files,
break; // Break on error or end of dir
// if (strlen((const char*)fno.fname) > SD_SCREEN_FILE_LENGTH)
// continue;
if (fno.fname[0] == '.' && fno.fname[1] != '.')
continue; // Ignore hidden files under UNIX, but not ..
if (fno.fattrib & (AM_HID|AM_SYS)) continue; /* Ignore hidden and system files */
if (fno.fname[0] == '.' && fno.fname[1] != '.') continue; // Ignore hidden files under UNIX, but not ..
if (fno.fattrib & AM_DIR) {
directories.push_back((char*)fno.fname);
radio/src/gui/colorlcd/model_templates.cpp
+14 -19
View File
@@ -84,25 +84,22 @@ SelectTemplate::SelectTemplate(TemplatePage* tp)
if (res == FR_OK) {
// read all entries
bool firstTime = true;
for (;;) {
res = sdReadDir(&dir, &fno, firstTime);
firstTime = false;
res = f_readdir(&dir, &fno);
if (res != FR_OK || fno.fname[0] == 0)
break; // Break on error or end of dir
if (strlen((const char*)fno.fname) > SD_SCREEN_FILE_LENGTH)
continue;
if (fno.fname[0] == '.')
continue;
if (!(fno.fattrib & AM_DIR)) {
const char *ext = getFileExtension(fno.fname);
if(ext && !strcasecmp(ext, YAML_EXT)) {
int len = ext - fno.fname;
if (len < FF_MAX_LFN) {
char name[FF_MAX_LFN] = { 0 };
strncpy(name, fno.fname, len);
files.push_back(name);
}
if (fno.fattrib & (AM_DIR|AM_HID|AM_SYS)) continue; /* Ignore folders, hidden and system files */
if (fno.fname[0] == '.') continue; /* Ignore UNIX hidden files */
const char *ext = getFileExtension(fno.fname);
if(ext && !strcasecmp(ext, YAML_EXT)) {
int len = ext - fno.fname;
if (len < FF_MAX_LFN) {
char name[FF_MAX_LFN] = { 0 };
strncpy(name, fno.fname, len);
files.push_back(name);
}
}
}
@@ -203,16 +200,14 @@ SelectTemplateFolder::SelectTemplateFolder(std::function<void(void)> update)
if (res == FR_OK) {
// read all entries
bool firstTime = true;
for (;;) {
res = sdReadDir(&dir, &fno, firstTime);
firstTime = false;
res = f_readdir(&dir, &fno);
if (res != FR_OK || fno.fname[0] == 0)
break; // Break on error or end of dir
if (strlen((const char*)fno.fname) > SD_SCREEN_FILE_LENGTH)
continue;
if (fno.fname[0] == '.')
continue;
if (fno.fattrib & (AM_HID|AM_SYS)) continue; /* Ignore hidden and system files */
if (fno.fname[0] == '.') continue; /* Ignore UNIX hidden files */
if (fno.fattrib & AM_DIR)
directories.push_back((char*)fno.fname);
}
radio/src/gui/colorlcd/radio_tools.cpp
+2 -3
View File
@@ -111,9 +111,8 @@ static void scanLuaTools(std::list<ToolEntry>& scripts)
TCHAR path[FF_MAX_LFN+1] = SCRIPTS_TOOLS_PATH "/";
res = f_readdir(&dir, &fno); /* Read a directory item */
if (res != FR_OK || fno.fname[0] == 0) break; /* Break on error or end of dir */
if (fno.fattrib & AM_DIR) continue; /* Skip subfolders */
if (fno.fattrib & AM_HID) continue; /* Skip hidden files */
if (fno.fattrib & AM_SYS) continue; /* Skip system files */
if (fno.fattrib & (AM_DIR|AM_HID|AM_SYS)) continue; // skip subfolders, hidden files and system files
if (fno.fname[0] == '.') continue; /* Ignore UNIX hidden files */
strcat(path, fno.fname);
if (isRadioScriptTool(fno.fname)) {
radio/src/gui/common/stdlcd/radio_sdmanager.cpp
+1 -1
View File
@@ -523,7 +523,7 @@ void menuRadioSdManager(event_t _event)
res = sdReadDir(&dir, &fno, firstTime);
if (res != FR_OK || fno.fname[0] == 0) break; /* Break on error or end of dir */
if (strlen(fno.fname) > SD_SCREEN_FILE_LENGTH) continue;
if (fno.fattrib & AM_HID) continue; /* Ignore Windows hidden files */
if (fno.fattrib & (AM_HID|AM_SYS)) continue; /* Ignore hidden and system files */
if (fno.fname[0] == '.' && fno.fname[1] != '.') continue; /* Ignore UNIX hidden files, but not .. */
reusableBuffer.sdManager.count++;
radio/src/gui/common/stdlcd/radio_tools.cpp
+2 -3
View File
@@ -128,9 +128,8 @@ void menuRadioTools(event_t event)
res = f_readdir(&dir, &fno); /* Read a directory item */
if (res != FR_OK || fno.fname[0] == 0) break; /* Break on error or end of dir */
if (fno.fattrib & AM_DIR) continue; /* Skip subfolders */
if (fno.fattrib & AM_HID) continue; /* Skip hidden files */
if (fno.fattrib & AM_SYS) continue; /* Skip system files */
if (fno.fattrib & (AM_DIR|AM_HID|AM_SYS)) continue; // skip subfolders, hidden files and system files
if (fno.fname[0] == '.') continue; /* Ignore UNIX hidden files */
strcat(path, fno.fname);
if (isRadioScriptTool(fno.fname)) {
radio/src/sdcard.cpp
+2 -3
View File
@@ -276,9 +276,8 @@ bool sdListFiles(const char * path, const char * extension, const uint8_t maxlen
for (;;) {
res = f_readdir(&dir, &fno); /* Read a directory item */
if (res != FR_OK || fno.fname[0] == 0) break; /* Break on error or end of dir */
if (fno.fattrib & AM_DIR) continue; /* Skip subfolders */
if (fno.fattrib & AM_HID) continue; /* Skip hidden files */
if (fno.fattrib & AM_SYS) continue; /* Skip system files */
if (fno.fattrib & (AM_DIR|AM_HID|AM_SYS)) continue; // skip subfolders, hidden files and system files
if (fno.fname[0] == '.') continue; /* Ignore UNIX hidden files */
fnExt = getFileExtension(fno.fname, 0, 0, &fnLen, &extLen);
fnLen -= extLen;