libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-03 08:40:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

COMMON: Use matchPathComponents param in FSDirectory::listMatchingMembers

Browse Source
This commit is contained in:
PushmePullyu 2024-03-11 19:00:37 +01:00 committed by Paul Gilbert
parent b5302bf3bc
commit 3902c07d74
1 changed files with 24 additions and 11 deletions

35
common/fs.cpp

@ -479,20 +479,33 @@ int FSDirectory::listMatchingMembers(ArchiveMemberList &list, const Path &patter
ensureCached();
int matches = 0;
for (NodeCache::const_iterator it = _fileCache.begin(); it != _fileCache.end(); ++it) {
if (it->_key.matchPattern(pattern)) {
list.push_back(ArchiveMemberPtr(new FSDirectoryFile(it->_key, it->_value)));
matches++;
}
}
if (_includeDirectories) {
for (NodeCache::const_iterator it = _subDirCache.begin(); it != _subDirCache.end(); ++it) {
if (it->_key.matchPattern(pattern)) {
const char pathSep = getPathSeparator();
const char pathSepStr[] = {pathSep, '\0'};
const char *wildCardExclusions = matchPathComponents ? nullptr : pathSepStr;
Common::String patternStr;
if (matchPathComponents)
patternStr = pattern.toString(pathSep);
auto addMatchingToList = [&](const NodeCache &nodeCache) {
for (NodeCache::const_iterator it = nodeCache.begin(); it != nodeCache.end(); ++it) {
bool isMatch;
if (matchPathComponents) {
Common::String keyStr = it->_key.toString(pathSep);
isMatch = keyStr.matchString(patternStr, true, wildCardExclusions);
} else
isMatch = it->_key.matchPattern(pattern);
if (isMatch) {
list.push_back(ArchiveMemberPtr(new FSDirectoryFile(it->_key, it->_value)));
matches++;
++matches;
}
}
}
};
addMatchingToList(_fileCache);
if (_includeDirectories)
addMatchingToList(_subDirCache);
return matches;
}