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

Fixed the ProjectDirectoryTree ignore regression...

Browse Source
This commit is contained in:
Martín Lucas Golini
2026-08-21 19:22:39 -03:00
parent e5057afe28
commit b4e8f0312c
1 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -460,13 +460,29 @@ void ProjectDirectoryTree::addFile( const FileInfo& file ) {
if ( mIgnoreHidden && file.isHidden() )
return;
Lock rl( mMatchingMutex );
Lock l( mFilesMutex );
std::string directory( file.getFilepath() );
const std::string& directoryEntry = file.getFilepath();
IgnoreMatcherManager matcher( getIgnoreMatcherFromPath( directoryEntry ) );
if ( matcher.foundMatch() && matcher.match( file ) ) {
if ( !mAllowedMatcher || !mAllowedMatcher->hasPatterns() )
return;
std::string_view localPath( directoryEntry );
if ( String::startsWith( directoryEntry, mAllowedMatcher->getPath() ) )
localPath.remove_prefix( mAllowedMatcher->getPath().size() );
if ( !mAllowedMatcher->match( localPath ) )
return;
} else if ( mDisallowedMatcher && mDisallowedMatcher->hasPatterns() ) {
std::string_view localPath( directoryEntry );
if ( String::startsWith( directoryEntry, mDisallowedMatcher->getPath() ) )
localPath.remove_prefix( mDisallowedMatcher->getPath().size() );
if ( mDisallowedMatcher->match( localPath ) )
return;
}
std::string directory( directoryEntry );
FileSystem::dirAddSlashAtEnd( directory );
Lock l( mFilesMutex );
std::vector<std::string> files;
std::vector<std::string> names;
std::set<std::string> info;
IgnoreMatcherManager matcher( getIgnoreMatcherFromPath( directory ) );
{
Lock ld( mDirectoriesMutex );
mDirectories.emplace_back( directory );