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

Allow to add a filtered file to the project file tree by adding it in .ecode/.prjallowed (SpartanJ/ecode#592).

Browse Source 
Allow canceling the global search with escape.
This commit is contained in:
Martín Lucas Golini
2025-07-17 16:43:42 -03:00
parent e5fd8c1647
commit a537214cc7
12 changed files with 155 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -80,6 +80,18 @@ void ProjectDirectoryTree::scan( const ProjectDirectoryTree::ScanCompleteEvent&
break;
}
}
if ( !found && mAllowedMatcher ) {
std::string_view file{ files[i] };
if ( String::startsWith( file, mAllowedMatcher->getPath() ) ) {
std::string_view localPath( std::string_view{ file }.substr(
mAllowedMatcher->getPath().size() ) );
if ( mAllowedMatcher->match( localPath ) ) {
found = true;
}
} else if ( mAllowedMatcher->match( file ) ) {
found = true;
}
}
if ( found ) {
mFiles.emplace_back( std::move( files[i] ) );
mNames.emplace_back( std::move( names[i] ) );
@@ -339,16 +351,18 @@ void ProjectDirectoryTree::getDirectoryFiles(
if ( ignoreMatcher.foundMatch() && ignoreMatcher.match( directory, file ) ) {
if ( !allowedMatcher || !allowedMatcher->hasPatterns() )
continue;
std::string localPath;
std::string_view localPath( fullpath );
if ( String::startsWith( directory, allowedMatcher->getPath() ) )
localPath = directory.substr( allowedMatcher->getPath().size() );
if ( !allowedMatcher->match( localPath + file ) )
localPath = std::string_view{ fullpath }.substr( allowedMatcher->getPath().size() );
if ( !allowedMatcher->match( localPath ) )
continue;
} else if ( disallowedMatcher && disallowedMatcher->hasPatterns() ) {
std::string localPath;
if ( String::startsWith( directory, disallowedMatcher->getPath() ) )
localPath = directory.substr( disallowedMatcher->getPath().size() );
if ( disallowedMatcher->match( localPath + file ) )
std::string_view localPath( fullpath );
if ( String::startsWith( directory, disallowedMatcher->getPath() ) ) {
localPath =
std::string_view{ fullpath }.substr( disallowedMatcher->getPath().size() );
}
if ( disallowedMatcher->match( localPath ) )
continue;
}