Ignore archive files given as layername in command line

pblottiere · pblottiere · commit 1fb9f2ae0138 · 2017-10-09T05:39:22.000+01:00
diff --git a/src/app/main.cpp b/src/app/main.cpp
@@ -98,6 +98,7 @@ typedef SInt32 SRefCon;
 #include "qgsvectorlayer.h"
 #include "qgis_app.h"
 #include "qgscrashhandler.h"
+#include "qgsziputils.h"
 
 #include "qgsuserprofilemanager.h"
 #include "qgsuserprofile.h"
@@ -1169,7 +1170,8 @@ int main( int argc, char *argv[] )
   {
     QgsDebugMsg( QString( "Trying to load file : %1" ).arg( layerName ) );
     // don't load anything with a .qgs extension - these are project files
-    if ( !layerName.endsWith( QLatin1String( ".qgs" ), Qt::CaseInsensitive ) )
+    if ( !layerName.endsWith( QLatin1String( ".qgs" ), Qt::CaseInsensitive )
+         && !QgsZipUtils::isZipFile( layerName ) )
     {
       qgis->openLayer( layerName );
     }

Original file line number	Diff line number	Diff line change
`@@ -98,6 +98,7 @@ typedef SInt32 SRefCon;`
`98`	`98`	`#include "qgsvectorlayer.h"`
`99`	`99`	`#include "qgis_app.h"`
`100`	`100`	`#include "qgscrashhandler.h"`
	`101`	`+#include "qgsziputils.h"`
`101`	`102`
`102`	`103`	`#include "qgsuserprofilemanager.h"`
`103`	`104`	`#include "qgsuserprofile.h"`
`@@ -1169,7 +1170,8 @@ int main( int argc, char *argv[] )`
`1169`	`1170`	`{`
`1170`	`1171`	`QgsDebugMsg( QString( "Trying to load file : %1" ).arg( layerName ) );`
`1171`	`1172`	`// don't load anything with a .qgs extension - these are project files`
`1172`		`- if ( !layerName.endsWith( QLatin1String( ".qgs" ), Qt::CaseInsensitive ) )`
	`1173`	`+ if ( !layerName.endsWith( QLatin1String( ".qgs" ), Qt::CaseInsensitive )`
	`1174`	`+ && !QgsZipUtils::isZipFile( layerName ) )`
`1173`	`1175`	`{`
`1174`	`1176`	`qgis->openLayer( layerName );`
`1175`	`1177`	`}`