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

#2813 Fix logic for removing common root path

Browse Source
This commit is contained in:
Bjørn Erik Jensen
2018-04-27 10:46:54 +02:00
parent 23c439fe6b
commit 7ff30a13d1
1 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
ApplicationCode/Application/Tools/RiaFilePathTools.cpp
View File

@@ -100,22 +100,30 @@ QString RiaFilePathTools::canonicalPath(const QString& path)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QString RiaFilePathTools::commonRootPath(const QStringList& paths) QString RiaFilePathTools::commonRootPath(const QStringList& paths)
{ {
QString root = paths.front(); if (paths.size() < 2) return "";
for (const auto& item : paths)
int i = 0;
int iDir = 0;
for(i = 0; ; i++)
{ {
if (root.length() > item.length()) root.truncate(item.length()); bool isCommon = true;
QChar ch = i < paths.front().size() ? paths.front()[i] : 0;
int iDir = 0; // Remember last directory separator
for (int i = 0; i < root.length(); ++i) if (i > 0 && (ch == '/' || ch == '\\')) iDir = i;
// Compare characters at position i
for (const QString& path : paths)
{ {
if (i > 0 && (root[i-1] == '/' || root[i-1] == '\\')) iDir = i; if (ch == 0 || path[i] != ch)
if (root[i] != item[i] || i == root.length() - 1)
{ {
root.truncate(std::min(i, iDir)); isCommon = false;
break; break;
} }
} }
if (!isCommon) break;
} }
return root;
return paths.front().left(iDir + 1);
} }