qi-hardware/gmenu2x
1
0
Fork 0
mirror of git://projects.qi-hardware.com/gmenu2x.git synced 2024-11-26 03:06:15 +02:00
Code

Simplified file extension filtering code

Browse Source 
Don't create any temporary strings, just use the d_name field and
strcasecmp.
This commit is contained in:
Maarten ter Huurne 2014-08-14 06:43:37 +02:00
parent 404b2a1029
commit 47d349f78b
1 changed files with 9 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/filelister.cpp
View File

@ -124,33 +124,18 @@ void FileLister::browse(const string& path, bool clean)
continue; continue;
} }
string file = dptr->d_name; // Determine file extension.
for (vector<string>::iterator it = filter.begin(); it != filter.end(); ++it) { const char *ext = strrchr(dptr->d_name, '.');
if (file.find('.') == string::npos) { if (ext) ext++; else ext = "";
if (!it->empty())
continue;
fileSet.insert(file); for (auto& filterExt : filter) {
// Note: strcasecmp can't compare multi-byte UTF-8 characters,
// but the filtered file extensions don't contain any of
// those.
if (strcasecmp(ext, filterExt.c_str()) == 0) {
fileSet.insert(string(dptr->d_name));
break; break;
} }
if (it->length() < file.length()) {
if (file[file.length() - it->length() - 1] != '.')
continue;
string file_lowercase =
file.substr(file.length() - it->length());
/* XXX: This won't accept UTF-8 codes.
* Thanksfully file extensions shouldn't contain any. */
transform(file_lowercase.begin(), file_lowercase.end(),
file_lowercase.begin(), ::tolower);
if (file_lowercase.compare(0, it->length(), *it) == 0) {
fileSet.insert(file);
break;
}
}
} }
} }
} }