[ogr] Add special handling for querying sublayers for an ArcInfo

coverage directory
qgis · Oct 6, 2021 · 0ddb4b3 · 0ddb4b3
1 parent 92707dc
commit 0ddb4b3
Show file tree

Hide file tree

Showing 25 changed files with 50 additions and 5 deletions.
diff --git a/src/core/providers/ogr/qgsogrprovidermetadata.cpp b/src/core/providers/ogr/qgsogrprovidermetadata.cpp
@@ -37,6 +37,7 @@ email                : nyall dot dawson at gmail dot com
 #include <QDir>
 #include <QMessageBox>
 #include <QRegularExpression>
+#include <QDirIterator>
 
 ///@cond PRIVATE
 
@@ -1102,18 +1103,26 @@ QList<QgsProviderSublayerDetails> QgsOgrProviderMetadata::querySublayers( const
     }
   }
 
+  const QStringList dirExtensions = QgsOgrProviderUtils::directoryExtensions();
+
   const QString path = uriParts.value( QStringLiteral( "path" ) ).toString();
   const QFileInfo pathInfo( path );
-  if ( ( flags & Qgis::SublayerQueryFlag::FastScan ) && ( pathInfo.isFile() || pathInfo.isDir() ) )
+  const QString suffix = pathInfo.suffix().toLower();
+  bool isOgrSupportedDirectory = pathInfo.isDir() && dirExtensions.contains( suffix );
+
+  bool forceDeepScanDir = false;
+  if ( pathInfo.isDir() && !isOgrSupportedDirectory )
+  {
+    QDirIterator it( path, { QStringLiteral( "*.adf" ), QStringLiteral( "*.ADF" ) }, QDir::Files | QDir::NoSymLinks | QDir::NoDotAndDotDot );
+    forceDeepScanDir = it.hasNext();
+  }
+
+  if ( ( flags & Qgis::SublayerQueryFlag::FastScan ) && ( pathInfo.isFile() || pathInfo.isDir() ) && !forceDeepScanDir )
   {
     // fast scan, so we don't actually try to open the dataset and instead just check the extension alone
     const QStringList fileExtensions = QgsOgrProviderUtils::fileExtensions();
-    const QStringList dirExtensions = QgsOgrProviderUtils::directoryExtensions();
-
-    const QString suffix = pathInfo.suffix().toLower();
 
     // allow only normal files or supported directories to continue
-    const bool isOgrSupportedDirectory = pathInfo.isDir() && dirExtensions.contains( suffix );
     if ( !isOgrSupportedDirectory && !pathInfo.isFile() )
       return {};
 

diff --git a/tests/src/python/test_provider_ogr.py b/tests/src/python/test_provider_ogr.py
@@ -2093,6 +2093,17 @@ def test_provider_sublayer_details(self):
             os.path.join(TEST_DATA_DIR, 'esri_tin', 'metadata.xml'))
         self.assertFalse(res)
 
+        # ESRI Arcinfo file
+        res = metadata.querySublayers(os.path.join(TEST_DATA_DIR, 'esri_coverage', 'testpolyavc'))
+        self.assertEqual(len(res), 4)
+        self.assertEqual(res[0].layerNumber(), 0)
+        self.assertEqual(res[0].name(), "ARC")
+        self.assertEqual(res[0].description(), "")
+        self.assertEqual(res[0].uri(), '{}|layername=ARC'.format(os.path.join(TEST_DATA_DIR, 'esri_coverage', 'testpolyavc'), "vector_vrt.vrt"))
+        self.assertEqual(res[0].providerKey(), "ogr")
+        self.assertEqual(res[0].type(), QgsMapLayerType.VectorLayer)
+        self.assertFalse(res[0].skippedContainerScan())
+
     @unittest.skipIf(int(gdal.VersionInfo('VERSION_NUM')) < GDAL_COMPUTE_VERSION(3, 4, 0), "GDAL 3.4 required")
     def test_provider_sublayer_details_hierarchy(self):
         """
@@ -2234,6 +2245,18 @@ def test_provider_sublayer_details_fast_scan(self):
             os.path.join(TEST_DATA_DIR, 'esri_tin', 'metadata.xml'), Qgis.SublayerQueryFlag.FastScan)
         self.assertFalse(res)
 
+        # ESRI Arcinfo file
+        res = metadata.querySublayers(
+            os.path.join(TEST_DATA_DIR, 'esri_coverage', 'testpolyavc'), Qgis.SublayerQueryFlag.FastScan)
+        self.assertEqual(len(res), 4)
+        self.assertEqual(res[0].layerNumber(), 0)
+        self.assertEqual(res[0].name(), "ARC")
+        self.assertEqual(res[0].description(), "")
+        self.assertEqual(res[0].uri(), '{}|layername=ARC'.format(os.path.join(TEST_DATA_DIR, 'esri_coverage', 'testpolyavc'), "vector_vrt.vrt"))
+        self.assertEqual(res[0].providerKey(), "ogr")
+        self.assertEqual(res[0].type(), QgsMapLayerType.VectorLayer)
+        self.assertFalse(res[0].skippedContainerScan())
+
     def test_provider_sidecar_files_for_uri(self):
         """
         Test retrieving sidecar files for uris

diff --git a/tests/testdata/esri_coverage/info/arc.dir b/tests/testdata/esri_coverage/info/arc.dir
diff --git a/tests/testdata/esri_coverage/info/arc0000.dat b/tests/testdata/esri_coverage/info/arc0000.dat
diff --git a/tests/testdata/esri_coverage/info/arc0000.nit b/tests/testdata/esri_coverage/info/arc0000.nit
diff --git a/tests/testdata/esri_coverage/info/arc0001.dat b/tests/testdata/esri_coverage/info/arc0001.dat
@@ -0,0 +1 @@
+../testpolyavc/bnd.adf                                                          
diff --git a/tests/testdata/esri_coverage/info/arc0001.nit b/tests/testdata/esri_coverage/info/arc0001.nit
diff --git a/tests/testdata/esri_coverage/info/arc0002.dat b/tests/testdata/esri_coverage/info/arc0002.dat
@@ -0,0 +1 @@
+../testpolyavc/pat.adf                                                          
diff --git a/tests/testdata/esri_coverage/info/arc0002.nit b/tests/testdata/esri_coverage/info/arc0002.nit
diff --git a/tests/testdata/esri_coverage/info/arc0003.dat b/tests/testdata/esri_coverage/info/arc0003.dat
diff --git a/tests/testdata/esri_coverage/info/arc0003.nit b/tests/testdata/esri_coverage/info/arc0003.nit
diff --git a/tests/testdata/esri_coverage/info/arc0004.dat b/tests/testdata/esri_coverage/info/arc0004.dat
@@ -0,0 +1 @@
+../testpolyavc/tic.adf                                                          
diff --git a/tests/testdata/esri_coverage/info/arc0004.nit b/tests/testdata/esri_coverage/info/arc0004.nit
diff --git a/tests/testdata/esri_coverage/testpolyavc/arc.adf b/tests/testdata/esri_coverage/testpolyavc/arc.adf
diff --git a/tests/testdata/esri_coverage/testpolyavc/arx.adf b/tests/testdata/esri_coverage/testpolyavc/arx.adf
diff --git a/tests/testdata/esri_coverage/testpolyavc/bnd.adf b/tests/testdata/esri_coverage/testpolyavc/bnd.adf
@@ -0,0 +1 @@
+H�|Jz>�H�t�JzD�
diff --git a/tests/testdata/esri_coverage/testpolyavc/cnt.adf b/tests/testdata/esri_coverage/testpolyavc/cnt.adf
diff --git a/tests/testdata/esri_coverage/testpolyavc/cnx.adf b/tests/testdata/esri_coverage/testpolyavc/cnx.adf
diff --git a/tests/testdata/esri_coverage/testpolyavc/lab.adf b/tests/testdata/esri_coverage/testpolyavc/lab.adf
diff --git a/tests/testdata/esri_coverage/testpolyavc/pal.adf b/tests/testdata/esri_coverage/testpolyavc/pal.adf
diff --git a/tests/testdata/esri_coverage/testpolyavc/pat.adf b/tests/testdata/esri_coverage/testpolyavc/pat.adf
diff --git a/tests/testdata/esri_coverage/testpolyavc/pax.adf b/tests/testdata/esri_coverage/testpolyavc/pax.adf
diff --git a/tests/testdata/esri_coverage/testpolyavc/prj.adf b/tests/testdata/esri_coverage/testpolyavc/prj.adf
@@ -0,0 +1,9 @@
+Projection    UTM
+Zone          13
+Datum         NAD27
+Zunits        NO
+Units         METERS
+Spheroid      CLARKE1866
+Xshift        0.0000000000
+Yshift        0.0000000000
+Parameters
diff --git a/tests/testdata/esri_coverage/testpolyavc/tic.adf b/tests/testdata/esri_coverage/testpolyavc/tic.adf
diff --git a/tests/testdata/esri_coverage/testpolyavc/tol.adf b/tests/testdata/esri_coverage/testpolyavc/tol.adf