OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#2768 Fix missing matches when root + path filter ends with an exact dir-name

Browse Source
This commit is contained in:
Jacob Støren
2018-04-25 08:50:53 +02:00
parent 87ccdd06af
commit 9f43da2d10
1 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
ApplicationCode/Commands/RicFileHierarchyDialog.cpp
View File

@@ -311,8 +311,13 @@ QStringList RicFileHierarchyDialog::findMatchingFiles()
if (m_rootDir->text().isEmpty()) return QStringList();
//const QStringList& dirs = buildDirectoryListRecursive(rootDir());
QStringList dirs;
buildDirectoryListRecursiveSimple(this->rootDir(), this->pathFilter(), &dirs );
if ( this->pathFilter().isEmpty() ) dirs.append(this->rootDir());
buildDirectoryListRecursiveSimple(this->rootDir(), this->pathFilter(), &dirs);
const QStringList& files = findFilesInDirs(dirs);
@@ -406,7 +411,8 @@ void RicFileHierarchyDialog::buildDirectoryListRecursiveSimple(const QString& ro
}
}
// Search pathfilter for the first wildcard. use the path up to that directory directly, short-cutting the search
// Search pathfilter for the first wildcard.
// Use the path up to that directory directly, short-cutting the search
{
std::set<int> sortedWildCardPositions;
sortedWildCardPositions.insert(currentRemainingpathFilter.indexOf("*"));
@@ -426,7 +432,6 @@ void RicFileHierarchyDialog::buildDirectoryListRecursiveSimple(const QString& ro
{
effectiveRootDir += SEPARATOR + currentRemainingpathFilter;
currentRemainingpathFilter = "";
//(*accumulatedDirs) += effectiveRootDir;
}
else
{
@@ -460,10 +465,21 @@ void RicFileHierarchyDialog::buildDirectoryListRecursiveSimple(const QString& ro
if ( currentDirNameFilter.isEmpty() ) currentDirNameFilter = "*";
QDir qdir(effectiveRootDir, currentDirNameFilter, QDir::NoSort, QDir::Dirs | QDir::NoDotAndDotDot);
QStringList subDirs = qdir.entryList();
QDir qdir(effectiveRootDir, currentDirNameFilter, QDir::NoSort, QDir::Dirs | QDir::NoDotAndDotDot);
// Add effectiveRoot if current dir name filter =""or"*" or "?" and currentRemainingpathFilter = ""
// and remainingPathFilter not empty
if ( (currentDirNameFilter == "*" || currentDirNameFilter == "?")
&& currentRemainingpathFilter.isEmpty()
&& !remainingPathFilter.isEmpty())
{
(*accumulatedDirs) += qdir.absolutePath();
}
QStringList subDirs = qdir.entryList();
for ( const QString& subDir : subDirs )
{
QString fullPath = qdir.absoluteFilePath(subDir);