mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-01 18:01:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

CFileBrowser: add fallback for possible missing init directory

Browse Source 
In some rare exceptional cases it is possible that  wrong  or missing
start directories could be defined.
Result: filebrowser window will be freezing, no key is helping.
With this fallback, filebrowser should jump into next existant upper
directory.
This commit is contained in:
Thilo Graf
2017-06-15 01:01:55 +02:00
parent aa4723173b
commit ecc1f4860c
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/gui/filebrowser.cpp
View File

@@ -42,6 +42,7 @@
#include <driver/display.h> #include <driver/display.h>
#include <driver/screen_max.h> #include <driver/screen_max.h>
#include <driver/fontrenderer.h> #include <driver/fontrenderer.h>
#include <system/debug.h>
#include <unistd.h> #include <unistd.h>
#include <stdio.h> #include <stdio.h>
@@ -555,19 +556,29 @@ bool CFileBrowser::readDir_std(const std::string & dirname, CFileList* flist)
struct stat64 statbuf; struct stat64 statbuf;
dirent64 **namelist; dirent64 **namelist;
int n; int n;
std::string to_scan_dir = dirname;
n = scandir64(dirname.c_str(), &namelist, 0, alphasort64); n = scandir64(to_scan_dir.c_str(), &namelist, 0, alphasort64);
if (n < 0) if (n < 0)
{ {
perror(("Filebrowser scandir: "+dirname).c_str()); std::string scn_err = "Filebrowser scandir: " + to_scan_dir + " ";
to_scan_dir = "/media/";
dprintf(DEBUG_NORMAL, "\033[33m[CFileBrowser]\[%s - %d], %s failed, %s, try fallback to [%s]\033[0m\n", __func__, __LINE__, scn_err.c_str(), strerror(errno), to_scan_dir.c_str());
n = scandir64(to_scan_dir.c_str(), &namelist, 0, alphasort64);
name = to_scan_dir;
}
if (n < 0){ //fallback failed
perror(("Filebrowser scandir: "+to_scan_dir).c_str());
return false; return false;
} }
for (int i = 0; i < n; i++) for (int i = 0; i < n; i++)
{ {
CFile file; CFile file;
if(strcmp(namelist[i]->d_name,".") != 0) if(strcmp(namelist[i]->d_name,".") != 0)
{ {
file.Name = dirname + namelist[i]->d_name; file.Name = to_scan_dir + namelist[i]->d_name;
// printf("file.Name: '%s', getFileName: '%s' getPath: '%s'\n",file.Name.c_str(),file.getFileName().c_str(),file.getPath().c_str()); // printf("file.Name: '%s', getFileName: '%s' getPath: '%s'\n",file.Name.c_str(),file.getFileName().c_str(),file.getPath().c_str());
if(stat64((file.Name).c_str(),&statbuf) != 0) if(stat64((file.Name).c_str(),&statbuf) != 0)