Merge pull request #9099 from elpaso/bugfix-21150-file-protocol-path-resolver

elpaso · web-flow · commit 185855b21449 · 2019-02-05T10:58:26.000+01:00
Strip file:// from local files path before resolving
diff --git a/src/core/qgspathresolver.cpp b/src/core/qgspathresolver.cpp
@@ -163,7 +163,8 @@ QString QgsPathResolver::writePath( const QString &src ) const
     return src;
   }
 
-  QFileInfo srcFileInfo( src );
+  // Strip "file://"
+  QFileInfo srcFileInfo( src.startsWith( QStringLiteral( "file://" ) ) ? src.mid( 7 ) : src );
   QString srcPath = srcFileInfo.exists() ? srcFileInfo.canonicalFilePath() : src;
 
   // if this is a VSIFILE, remove the VSI prefix and append to final result
diff --git a/tests/src/core/testqgsproject.cpp b/tests/src/core/testqgsproject.cpp
@@ -41,6 +41,7 @@ class TestQgsProject : public QObject
     void testProjectUnits();
     void variablesChanged();
     void testLayerFlags();
+    void testLocalFiles();
 };
 
 void TestQgsProject::init()
@@ -386,6 +387,25 @@ void TestQgsProject::testLayerFlags()
   QVERIFY( !layer->flags().testFlag( QgsMapLayer::Removable ) );
 }
 
+void TestQgsProject::testLocalFiles()
+{
+  QTemporaryFile f;
+  QVERIFY( f.open() );
+  f.close();
+  QgsProject prj;
+  QFileInfo info( f.fileName() );
+  prj.setFileName( f.fileName() );
+  prj.write();
+  QString shpPath = info.dir().path() + '/' + info.baseName() + ".shp";
+  QString layerPath = "file://" + shpPath;
+  QFile f2( shpPath );
+  QVERIFY( f2.open( QFile::ReadWrite ) );
+  f2.close();
+  QgsPathResolver resolver( f.fileName( ) );
+  QCOMPARE( resolver.writePath( layerPath ), QString( "./" + info.baseName() + ".shp" ) ) ;
+
+}
+
 
 QGSTEST_MAIN( TestQgsProject )
 #include "testqgsproject.moc"

Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,8 @@ QString QgsPathResolver::writePath( const QString &src ) const`
`163`	`163`	`return src;`
`164`	`164`	`}`
`165`	`165`
`166`		`- QFileInfo srcFileInfo( src );`
	`166`	`+ // Strip "file://"`
	`167`	`+ QFileInfo srcFileInfo( src.startsWith( QStringLiteral( "file://" ) ) ? src.mid( 7 ) : src );`
`167`	`168`	`QString srcPath = srcFileInfo.exists() ? srcFileInfo.canonicalFilePath() : src;`
`168`	`169`
`169`	`170`	`// if this is a VSIFILE, remove the VSI prefix and append to final result`