Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-09-22 13:01:05 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix indexing files added in new directories

Browse Source 
Scan newly added directory subtrees even after the initial project scan has finished, ensuring their files are added to ProjectDirectoryTree and become available to the universal locator.
Preserve initial-scan cancellation, respect hidden-file settings and accepted patterns, and avoid inserting duplicate files.
This commit is contained in:
Martín Lucas Golini
2026-08-21 17:03:47 -03:00
parent 866163457e
commit e5057afe28
2 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/tools/ecode/projectdirectorytree.cpp
View File

@@ -341,12 +341,12 @@ void ProjectDirectoryTree::getDirectoryFiles(
std::vector<std::string>& files, std::vector<std::string>& names, std::string directory,
std::set<std::string> currentDirs, const bool& ignoreHidden,
IgnoreMatcherManager& ignoreMatcher, GitIgnoreMatcher* allowedMatcher,
GitIgnoreMatcher* disallowedMatcher ) {
if ( !mRunning )
GitIgnoreMatcher* disallowedMatcher, bool initialScan ) {
if ( mClosing || ( initialScan && !mRunning ) )
return;
currentDirs.insert( directory );
std::vector<std::string> pathFiles =
FileSystem::filesGetInPath( directory, false, false, false );
FileSystem::filesGetInPath( directory, false, false, ignoreHidden );
for ( auto& file : pathFiles ) {
std::string fullpath( directory + file );
if ( ignoreMatcher.foundMatch() && ignoreMatcher.match( directory, file ) ) {
@@ -393,7 +393,7 @@ void ProjectDirectoryTree::getDirectoryFiles(
ignoreMatcher.addChild( childMatch );
}
getDirectoryFiles( files, names, fullpath, currentDirs, ignoreHidden, ignoreMatcher,
allowedMatcher, disallowedMatcher );
allowedMatcher, disallowedMatcher, initialScan );
if ( childMatch ) {
ignoreMatcher.removeChild( childMatch );
eeSAFE_DELETE( childMatch );
@@ -461,31 +461,30 @@ void ProjectDirectoryTree::addFile( const FileInfo& file ) {
return;
Lock rl( mMatchingMutex );
Lock l( mFilesMutex );
std::string directory( file.getFilepath() );
FileSystem::dirAddSlashAtEnd( directory );
std::vector<std::string> files;
std::vector<std::string> names;
std::vector<LuaPattern> patterns;
std::set<std::string> info;
if ( !mAcceptedPatterns.empty() ) {
getDirectoryFiles( files, names, mPath, info, false, mIgnoreMatcher,
mAllowedMatcher.get(), mDisallowedMatcher.get() );
size_t namesCount = names.size();
bool found;
for ( size_t i = 0; i < namesCount; i++ ) {
found = false;
for ( auto& pattern : patterns ) {
if ( pattern.matches( names[i] ) ) {
found = true;
break;
}
}
if ( found ) {
mFiles.emplace_back( std::move( files[i] ) );
mNames.emplace_back( std::move( names[i] ) );
IgnoreMatcherManager matcher( getIgnoreMatcherFromPath( directory ) );
{
Lock ld( mDirectoriesMutex );
mDirectories.emplace_back( directory );
}
getDirectoryFiles( files, names, directory, info, mIgnoreHidden, matcher,
mAllowedMatcher.get(), mDisallowedMatcher.get(), false );
for ( size_t i = 0; i < files.size(); ++i ) {
bool accepted = mAcceptedPatterns.empty();
for ( const auto& pattern : mAcceptedPatterns ) {
if ( pattern.matches( files[i] ) ) {
accepted = true;
break;
}
}
} else {
getDirectoryFiles( mFiles, mNames, mPath, info, false, mIgnoreMatcher,
mAllowedMatcher.get(), mDisallowedMatcher.get() );
if ( accepted && std::find( mFiles.begin(), mFiles.end(), files[i] ) == mFiles.end() ) {
mFiles.emplace_back( std::move( files[i] ) );
mNames.emplace_back( std::move( names[i] ) );
}
}
} else {
tryAddFile( file );

3
src/tools/ecode/projectdirectorytree.hpp
View File

@@ -193,7 +193,8 @@ class ProjectDirectoryTree {
void getDirectoryFiles( std::vector<std::string>& files, std::vector<std::string>& names,
std::string directory, std::set<std::string> currentDirs,
const bool& ignoreHidden, IgnoreMatcherManager& ignoreMatcher,
GitIgnoreMatcher* allowedMatcher, GitIgnoreMatcher* disallowedMatcher );
GitIgnoreMatcher* allowedMatcher, GitIgnoreMatcher* disallowedMatcher,
bool initialScan = true );
void addFile( const FileInfo& file );