From b108cb71514f45bb621df151c5ce09b7ef2557c4 Mon Sep 17 00:00:00 2001 From: Albert S Date: Mon, 13 Jun 2022 21:49:04 +0200 Subject: [PATCH] shared: Indexer: Exclude 'excludedPaths' settings already at DirScanner, not only FileSaver --- shared/indexer.cpp | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/shared/indexer.cpp b/shared/indexer.cpp index 974fe18..23cb797 100644 --- a/shared/indexer.cpp +++ b/shared/indexer.cpp @@ -19,7 +19,21 @@ void Indexer::beginIndexing() QVector dirs; WildcardMatcher wildcardMatcher; - wildcardMatcher.setPatterns(this->ignorePattern); + + QStringList ignoreList = this->ignorePattern; + + for(QString &excludedPath : Common::excludedPaths()) + { + QString pattern = excludedPath; + if(!pattern.endsWith("/")) + { + pattern += "/"; + } + pattern += "*"; + ignoreList.append(excludedPath); + } + ignoreList.append(this->ignorePattern); + wildcardMatcher.setPatterns(ignoreList); for(QString &path : this->pathsToScan) { if(wildcardMatcher.match(path)) @@ -40,7 +54,7 @@ void Indexer::beginIndexing() if(!dirs.empty()) { this->dirScanner->setPaths(dirs); - this->dirScanner->setIgnorePatterns(this->ignorePattern); + this->dirScanner->setIgnorePatterns(ignoreList); this->dirScanner->scan(); }