From 2a6a1f00413ae7870beaaba5b2f75f26ad61dbb7 Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Mon, 3 May 2010 21:14:11 +0200 Subject: [PATCH] filelister.cpp: Small cleanup --- src/filelister.cpp | 97 ++++++++++++++++++++++++++++------------------ 1 file changed, 60 insertions(+), 37 deletions(-) diff --git a/src/filelister.cpp b/src/filelister.cpp index 3a87c33..ceec256 100644 --- a/src/filelister.cpp +++ b/src/filelister.cpp @@ -30,31 +30,40 @@ using namespace std; -FileLister::FileLister(const string &startPath, bool showDirectories, bool showFiles) { - this->showDirectories = showDirectories; - this->showFiles = showFiles; - setPath(startPath,false); +FileLister::FileLister(const string &startPath, bool showDirectories, + bool showFiles) : showDirectories(showDirectories), showFiles(showFiles) +{ + setPath(startPath, false); } -const string &FileLister::getPath() { +const string &FileLister::getPath() +{ return path; } -void FileLister::setPath(const string &path, bool doBrowse) { + +void FileLister::setPath(const string &path, bool doBrowse) +{ this->path = path; - if (this->path[path.length()-1]!='/') + + if (this->path[path.length() - 1]!='/') this->path += "/"; + if (doBrowse) browse(); } -const string &FileLister::getFilter() { +const string &FileLister::getFilter() +{ return filter; } -void FileLister::setFilter(const string &filter) { + +void FileLister::setFilter(const string &filter) +{ this->filter = filter; } -void FileLister::browse() { +void FileLister::browse() +{ directories.clear(); files.clear(); @@ -66,7 +75,7 @@ void FileLister::browse() { } vector vfilter; - split(vfilter,getFilter(),","); + split(vfilter, getFilter(), ","); string filepath, file; struct stat st; @@ -74,8 +83,11 @@ void FileLister::browse() { while ((dptr = readdir(dirp))) { file = dptr->d_name; - if (file[0]=='.' && file!="..") continue; - filepath = path+file; + + if (file[0] == '.' && file != "..") + continue; + + filepath = path + file; int statRet = stat(filepath.c_str(), &st); if (statRet == -1) { cout << "\033[0;34mGMENU2X:\033[0;31m stat failed on '" << filepath << "' with error '" << strerror(errno) << "'\033[0m" << endl; @@ -86,52 +98,63 @@ void FileLister::browse() { continue; if (S_ISDIR(st.st_mode)) { - if (!showDirectories) continue; -#ifdef TARGET_GP2X -// if (!(path=="/card/" && (file!="sd" && file!="ext" && file!="nand"))) -#endif - directories.push_back(file); + if (!showDirectories) + continue; + directories.push_back(file); } else { - if (!showFiles) continue; - bool filterOk = false; - for (uint i = 0; i::iterator it = vfilter.begin(); it != vfilter.end(); ++it) { + if (it->length() <= file.length()) { + if (file.compare(file.length() - it->length(), it->length(), *it) == 0) { + files.push_back(file); + break; + } + } + } } } closedir(dirp); - sort(files.begin(),files.end(),case_less()); - sort(directories.begin(),directories.end(),case_less()); + sort(files.begin(), files.end(), case_less()); + sort(directories.begin(), directories.end(), case_less()); } } -uint FileLister::size() { - return files.size()+directories.size(); +unsigned int FileLister::size() +{ + return files.size() + directories.size(); } -uint FileLister::dirCount() { + +unsigned int FileLister::dirCount() +{ return directories.size(); } -uint FileLister::fileCount() { + +unsigned int FileLister::fileCount() +{ return files.size(); } -string FileLister::operator[](uint x) { +string FileLister::operator[](uint x) +{ return at(x); } -string FileLister::at(uint x) { - if (x=directories.size() && x= directories.size() && x < size(); } -bool FileLister::isDirectory(uint x) { - return x