Merge pull request #32666 from pblottiere/fix_emblayer_qgz

Read qgz project when embedding layers/groups. Fixes #28280
qgis · Nov 20, 2019 · e8b38c3 · e8b38c3
2 parents 0e110cf + 0aea46b
commit e8b38c3
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 3 deletions.
diff --git a/src/core/qgslayerdefinition.cpp b/src/core/qgslayerdefinition.cpp
@@ -442,8 +442,16 @@ QgsLayerDefinition::DependencySorter::DependencySorter( const QString &fileName
   : mHasCycle( false )
   , mHasMissingDependency( false )
 {
+  QString qgsProjectFile = fileName;
+  QgsProjectArchive archive;
+  if ( fileName.endsWith( QLatin1String( ".qgz" ), Qt::CaseInsensitive ) )
+  {
+    archive.unzip( fileName );
+    qgsProjectFile = archive.projectFile();
+  }
+
   QDomDocument doc;
-  QFile pFile( fileName );
+  QFile pFile( qgsProjectFile );
   ( void )pFile.open( QIODevice::ReadOnly );
   ( void )doc.setContent( &pFile );
   init( doc );

diff --git a/src/core/qgsproject.cpp b/src/core/qgsproject.cpp
@@ -2475,13 +2475,21 @@ bool QgsProject::createEmbeddedLayer( const QString &layerId, const QString &pro
   static QDateTime sPrevProjectFileTimestamp;
   static QDomDocument sProjectDocument;
 
+  QString qgsProjectFile = projectFilePath;
+  QgsProjectArchive archive;
+  if ( projectFilePath.endsWith( QLatin1String( ".qgz" ), Qt::CaseInsensitive ) )
+  {
+    archive.unzip( projectFilePath );
+    qgsProjectFile = archive.projectFile();
+  }
+
   QDateTime projectFileTimestamp = QFileInfo( projectFilePath ).lastModified();
 
   if ( projectFilePath != sPrevProjectFilePath || projectFileTimestamp != sPrevProjectFileTimestamp )
   {
     sPrevProjectFilePath.clear();
 
-    QFile projectFile( projectFilePath );
+    QFile projectFile( qgsProjectFile );
     if ( !projectFile.open( QIODevice::ReadOnly ) )
     {
       return false;
@@ -2555,8 +2563,16 @@ bool QgsProject::createEmbeddedLayer( const QString &layerId, const QString &pro
 
 QgsLayerTreeGroup *QgsProject::createEmbeddedGroup( const QString &groupName, const QString &projectFilePath, const QStringList &invisibleLayers, QgsProject::ReadFlags flags )
 {
+  QString qgsProjectFile = projectFilePath;
+  QgsProjectArchive archive;
+  if ( projectFilePath.endsWith( QLatin1String( ".qgz" ), Qt::CaseInsensitive ) )
+  {
+    archive.unzip( projectFilePath );
+    qgsProjectFile = archive.projectFile();
+  }
+
   // open project file, get layer ids in group, add the layers
-  QFile projectFile( projectFilePath );
+  QFile projectFile( qgsProjectFile );
   if ( !projectFile.open( QIODevice::ReadOnly ) )
   {
     return nullptr;

diff --git a/tests/src/core/testqgsproject.cpp b/tests/src/core/testqgsproject.cpp
@@ -46,6 +46,7 @@ class TestQgsProject : public QObject
     void testLocalUrlFiles();
     void testReadFlags();
     void testSetGetCrs();
+    void testEmbeddedLayerGroupFromQgz();
 };
 
 void TestQgsProject::init()
@@ -466,6 +467,24 @@ void TestQgsProject::testReadFlags()
   QCOMPARE( p3.layoutManager()->layouts().count(), 0 );
 }
 
+void TestQgsProject::testEmbeddedLayerGroupFromQgz()
+{
+  QString path = QString( TEST_DATA_DIR ) + QStringLiteral( "/embedded_groups/project1.qgz" );
+  QList<QDomNode> brokenNodes;
+
+  QgsProject p0;
+  p0.read( path );
+  QgsMapLayer *points = p0.mapLayersByName( "points" )[0];
+  QgsMapLayer *polys = p0.mapLayersByName( "polys" )[0];
+
+  QgsProject p1;
+  p1.createEmbeddedLayer( points->id(), p0.fileName(), brokenNodes );
+  p1.createEmbeddedGroup( "group1", p0.fileName(), QStringList() );
+
+  QCOMPARE( p1.layerIsEmbedded( points->id() ), path );
+  QCOMPARE( p1.layerIsEmbedded( polys->id() ), path );
+}
+
 void TestQgsProject::testSetGetCrs()
 {
   QgsProject p;

diff --git a/tests/src/python/test_qgslayerdefinition.py b/tests/src/python/test_qgslayerdefinition.py
@@ -10,6 +10,7 @@
 __date__ = '07/01/2016'
 __copyright__ = 'Copyright 2016, The QGIS Project'
 
+import os
 import qgis  # NOQA
 
 from qgis.core import (QgsProject,
@@ -52,6 +53,12 @@ def testDependency(self):
         self.assertEqual(nodeIds[0], "layerA")
         self.assertEqual(nodeIds[1], "layerB")
 
+    def testDependencyQgz(self):
+        path = os.path.join(TEST_DATA_DIR, "embedded_groups", "project1.qgz")
+        dep = QgsLayerDefinition.DependencySorter(path)
+        ids = dep.sortedLayerIds()
+        self.assertEqual(len(ids), 3)
+
     def testMissingDependency(self):
         inDoc = """
         <maplayers>

diff --git a/tests/testdata/embedded_groups/project1.qgz b/tests/testdata/embedded_groups/project1.qgz