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

#6411 Import Ensemble : Windows-style network path not working as effective filter

Browse Source
This commit is contained in:
Magne Sjaastad 2020-09-02 14:11:18 +02:00
parent 27ee22f420
commit 3518a63347
2 changed files with 48 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -122,12 +122,24 @@ std::pair<QString, QString> RiaFilePathTools::toFolderAndFileName( const QString
QString RiaFilePathTools::removeDuplicatePathSeparators( const QString& path ) QString RiaFilePathTools::removeDuplicatePathSeparators( const QString& path )
{ {
QString correctedPath = path; QString correctedPath = path;
int len; QString prefix;
do
QString doubleBackslash = R"(\\)";
if ( correctedPath.size() > 2 )
{ {
len = correctedPath.size(); QString prefixCandidate = correctedPath.left( 2 );
correctedPath.replace( QString( "%1%1" ).arg( separator() ), separator() ); if ( prefixCandidate == doubleBackslash || prefixCandidate == "//" )
} while ( correctedPath.size() != len ); {
prefix = prefixCandidate;
correctedPath = correctedPath.right( correctedPath.size() - 2 );
}
}
correctedPath.replace( QString( "%1%1" ).arg( separator() ), separator() );
correctedPath.replace( doubleBackslash, R"(\)" );
correctedPath = prefix + correctedPath;
return correctedPath; return correctedPath;
} }

30
ApplicationCode/UnitTests/RiaFilePathTools-Test.cpp
View File

@ -82,3 +82,33 @@ TEST( RiaFilePathTools, rootSearchPathFromSearchFilter )
EXPECT_EQ( QString( "//A/B[?]/E/" ), resultRootPath ); EXPECT_EQ( QString( "//A/B[?]/E/" ), resultRootPath );
} }
} }
//--------------------------------------------------------------------------------------------------
TEST( RiaFilePathTools, removeDuplicatePathSeparators )
{
{
QString testPath( "//myshare/folder-a/folder-b/" );
QString resultRootPath = RiaFilePathTools::removeDuplicatePathSeparators( testPath );
EXPECT_STRCASEEQ( testPath.toLatin1(), resultRootPath.toLatin1() );
}
{
QString testPath( "//myshare/folder-a//folder-b/" );
QString expectedPath( "//myshare/folder-a/folder-b/" );
QString resultRootPath = RiaFilePathTools::removeDuplicatePathSeparators( testPath );
EXPECT_STRCASEEQ( expectedPath.toLatin1(), resultRootPath.toLatin1() );
}
{
QString testPath( R"(\\myshare\folder-a\folder-b\)" );
QString resultRootPath = RiaFilePathTools::removeDuplicatePathSeparators( testPath );
EXPECT_STRCASEEQ( testPath.toLatin1(), resultRootPath.toLatin1() );
}
{
QString testPath( R"(\\myshare\folder-a\\folder-b\\)" );
QString expectedPath( R"(\\myshare\folder-a\folder-b\)" );
QString resultRootPath = RiaFilePathTools::removeDuplicatePathSeparators( testPath );
EXPECT_STRCASEEQ( expectedPath.toLatin1(), resultRootPath.toLatin1() );
}
}