actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Only spend time uniquifying results if more than one driver returned results. If we do, only operate on the new data.

Browse Source
This commit is contained in:
Glenn Maynard
2005-09-07 03:24:18 +00:00
parent a80ecb0431
commit 4b3af3058b
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageFileManager.cpp
+11 -5
View File
@@ -363,6 +363,8 @@ void RageFileManager::GetDirListing( CString sPath, CStringArray &AddTo, bool bO
vector<LoadedDriver *> apDriverList; vector<LoadedDriver *> apDriverList;
ReferenceAllDrivers( apDriverList ); ReferenceAllDrivers( apDriverList );
int iDriversThatReturnedFiles = 0;
int iOldSize = AddTo.size();
for( unsigned i = 0; i < apDriverList.size(); ++i ) for( unsigned i = 0; i < apDriverList.size(); ++i )
{ {
LoadedDriver *pLoadedDriver = apDriverList[i]; LoadedDriver *pLoadedDriver = apDriverList[i];
@@ -373,6 +375,8 @@ void RageFileManager::GetDirListing( CString sPath, CStringArray &AddTo, bool bO
const unsigned OldStart = AddTo.size(); const unsigned OldStart = AddTo.size();
pLoadedDriver->m_pDriver->GetDirListing( p, AddTo, bOnlyDirs, bReturnPathToo ); pLoadedDriver->m_pDriver->GetDirListing( p, AddTo, bOnlyDirs, bReturnPathToo );
if( AddTo.size() != OldStart )
++iDriversThatReturnedFiles;
/* If returning the path, prepend the mountpoint name to the files this driver returned. */ /* If returning the path, prepend the mountpoint name to the files this driver returned. */
if( bReturnPathToo && pLoadedDriver->m_sMountPoint.size() > 0 ) if( bReturnPathToo && pLoadedDriver->m_sMountPoint.size() > 0 )
@@ -388,11 +392,13 @@ void RageFileManager::GetDirListing( CString sPath, CStringArray &AddTo, bool bO
UnreferenceAllDrivers( apDriverList ); UnreferenceAllDrivers( apDriverList );
/* More than one driver might return the same file. Remove duplicates (case- if( iDriversThatReturnedFiles > 1 )
* insensitively). */ {
sort( AddTo.begin(), AddTo.end(), ilt ); /* More than one driver returned files. Remove duplicates (case-insensitively). */
CStringArray::iterator it = unique( AddTo.begin(), AddTo.end(), ieq ); sort( AddTo.begin()+iOldSize, AddTo.end(), ilt );
AddTo.erase(it, AddTo.end()); CStringArray::iterator it = unique( AddTo.begin()+iOldSize, AddTo.end(), ieq );
AddTo.erase(it, AddTo.end());
}
} }
bool RageFileManager::Remove( CString sPath ) bool RageFileManager::Remove( CString sPath )