[browser] Add missing delete actions for more file types

Author: nyalldawson

src/providers/ogr/qgsgeopackagedataitems.cpp

@@ -172,7 +172,7 @@ QWidget *QgsGeoPackageRootItem::paramWidget()
 
 QList<QAction *> QgsGeoPackageCollectionItem::actions( QWidget *parent )
 {
-  QList<QAction *> lst;
+  QList<QAction *> lst = QgsDataCollectionItem::actions( parent );
 
   if ( QgsOgrDbConnection::connectionList( QStringLiteral( "GPKG" ) ).contains( mName ) )
   {
@@ -193,6 +193,24 @@ QList<QAction *> QgsGeoPackageCollectionItem::actions( QWidget *parent )
   connect( actionAddTable, &QAction::triggered, this, &QgsGeoPackageCollectionItem::addTable );
   lst.append( actionAddTable );
 
+  QAction *sep = new QAction( parent );
+  sep->setSeparator( true );
+  lst.append( sep );
+
+  QString message = QObject::tr( "Delete %1…" ).arg( mName );
+  QAction *actionDelete = new QAction( message, parent );
+
+  // IMPORTANT - we need to capture the stuff we need, and then hand the slot
+  // off to a static method. This is because it's possible for this item
+  // to be deleted in the background on us (e.g. by a parent directory refresh)
+  const QString path = mPath;
+  QPointer< QgsDataItem > parentItem( mParent );
+  connect( actionDelete, &QAction::triggered, this, [ path, parentItem ]
+  {
+    deleteGpkg( path, parentItem );
+  } );
+  lst.append( actionDelete );
+
   // Run VACUUM
   QAction *actionVacuumDb = new QAction( tr( "Compact Database (VACUUM)" ), parent );
   connect( actionVacuumDb, &QAction::triggered, this, &QgsGeoPackageConnectionItem::vacuumGeoPackageDbAction );
@@ -202,6 +220,47 @@ QList<QAction *> QgsGeoPackageCollectionItem::actions( QWidget *parent )
   return lst;
 }
 
+void QgsGeoPackageCollectionItem::deleteGpkg( const QString &path, QPointer<QgsDataItem> parent )
+{
+  const QString title = QObject::tr( "Delete GeoPackage" );
+  // Check if the layer is in the project
+  const QgsMapLayer *projectLayer = nullptr;
+  const auto mapLayers = QgsProject::instance()->mapLayers();
+  for ( auto it = mapLayers.constBegin(); it != mapLayers.constEnd(); ++it )
+  {
+    const QVariantMap parts = QgsProviderRegistry::instance()->decodeUri( it.value()->dataProvider()->name(), it.value()->source() );
+    if ( parts.value( QStringLiteral( "path" ) ).toString() == path )
+    {
+      projectLayer = it.value();
+    }
+  }
+  if ( ! projectLayer )
+  {
+    const QString confirmMessage = QObject::tr( "Are you sure you want to delete '%1'?" ).arg( path );
+
+    if ( QMessageBox::question( nullptr, title,
+                                confirmMessage,
+                                QMessageBox::Yes | QMessageBox::No, QMessageBox::No ) != QMessageBox::Yes )
+      return;
+
+    if ( !QFile::remove( path ) )
+    {
+      QMessageBox::warning( nullptr, title, tr( "Could not delete GeoPackage." ) );
+    }
+    else
+    {
+      QMessageBox::information( nullptr, title, tr( "GeoPackage deleted successfully." ) );
+      if ( parent )
+        parent->refresh();
+    }
+  }
+  else
+  {
+    QMessageBox::warning( nullptr, title, QObject::tr( "The GeoPackage '%1' cannot be deleted because it is in the current project as '%2',"
+                          " remove it from the project and retry." ).arg( path, projectLayer->name() ) );
+  }
+}
+
 bool QgsGeoPackageCollectionItem::handleDrop( const QMimeData *data, Qt::DropAction )
 {
 

src/providers/ogr/qgsgeopackagedataitems.h

@@ -83,6 +83,8 @@ class QgsGeoPackageCollectionItem : public QgsDataCollectionItem
     bool acceptDrop() override { return true; }
     bool handleDrop( const QMimeData *data, Qt::DropAction action ) override;
     QList<QAction *> actions( QWidget *parent ) override;
+    static void deleteGpkg( const QString &path, QPointer< QgsDataItem > parent );
+
 #endif
 
     //! Returns the layer type from \a geometryType

src/providers/ogr/qgsogrdataitems.cpp

@@ -24,6 +24,7 @@
 #include "qgsrasterlayer.h"
 #include "qgsgeopackagedataitems.h"
 #include "qgsogrutils.h"
+#include "qgsproviderregistry.h"
 
 #include <QFileInfo>
 #include <QTextStream>
@@ -510,6 +511,85 @@ bool QgsOgrDataCollectionItem::createConnection( const QString &name, const QStr
   return storeConnection( path, ogrDriverName );
 }
 
+#ifdef HAVE_GUI
+QList<QAction *> QgsOgrDataCollectionItem::actions( QWidget *parent )
+{
+  QList<QAction *> lst = QgsDataCollectionItem::actions( parent );
+
+  const bool isFolder = QFileInfo( mPath ).isDir();
+  // Messages are different for files and tables
+  QString message = QObject::tr( "Delete %1 “%2”…" ).arg( isFolder ? tr( "Folder" ) : tr( "File" ), mName );
+  QAction *actionDeleteLayer = new QAction( message, parent );
+
+  // IMPORTANT - we need to capture the stuff we need, and then hand the slot
+  // off to a static method. This is because it's possible for this item
+  // to be deleted in the background on us (e.g. by a parent directory refresh)
+  const QString path = mPath;
+  QPointer< QgsDataItem > parentItem( mParent );
+  connect( actionDeleteLayer, &QAction::triggered, this, [ path, parentItem ]
+  {
+    deleteCollection( path, parentItem );
+  } );
+  lst.append( actionDeleteLayer );
+
+  return lst;
+}
+
+void QgsOgrDataCollectionItem::deleteCollection( const QString &path, QPointer<QgsDataItem> parent )
+{
+  const bool isFolder = QFileInfo( path ).isDir();
+  const QString type = isFolder ? tr( "folder" ) : tr( "file" );
+  const QString typeCaps = isFolder ? tr( "Folder" ) : tr( "File" );
+  const QString title = QObject::tr( "Delete %1" ).arg( type );
+  // Check if the layer is in the project
+  const QgsMapLayer *projectLayer = nullptr;
+  const auto mapLayers = QgsProject::instance()->mapLayers();
+  for ( auto it = mapLayers.constBegin(); it != mapLayers.constEnd(); ++it )
+  {
+    const QVariantMap parts = QgsProviderRegistry::instance()->decodeUri( it.value()->dataProvider()->name(), it.value()->source() );
+    if ( parts.value( QStringLiteral( "path" ) ).toString() == path )
+    {
+      projectLayer = it.value();
+    }
+  }
+  if ( ! projectLayer )
+  {
+    const QString confirmMessage = QObject::tr( "Are you sure you want to delete '%1'?" ).arg( path );
+
+    if ( QMessageBox::question( nullptr, title,
+                                confirmMessage,
+                                QMessageBox::Yes | QMessageBox::No, QMessageBox::No ) != QMessageBox::Yes )
+      return;
+
+    bool res = false;
+    if ( isFolder )
+    {
+      // e.g. the abomination which is gdb
+      QDir dir( path );
+      res = dir.removeRecursively();
+    }
+    else
+    {
+      res = QFile::remove( path );
+    }
+    if ( !res )
+    {
+      QMessageBox::warning( nullptr, title, tr( "Could not delete %1." ).arg( type ) );
+    }
+    else
+    {
+      QMessageBox::information( nullptr, title, tr( "%1 deleted successfully." ).arg( typeCaps ) );
+      if ( parent )
+        parent->refresh();
+    }
+  }
+  else
+  {
+    QMessageBox::warning( nullptr, title, QObject::tr( "The %1 '%2' cannot be deleted because it is in the current project as '%3',"
+                          " remove it from the project and retry." ).arg( type, path, projectLayer->name() ) );
+  }
+}
+#endif
 
 // ---------------------------------------------------------------------------
 
@@ -638,10 +718,14 @@ QgsDataItem *QgsOgrDataItemProvider::createDataItem( const QString &pathIn, QgsD
   //       with the companion variable (same name) in the gdal provider
   //       class
   // TODO: add more OGR supported multiple layers formats here!
-  QStringList ogrSupportedDbLayersExtensions;
-  ogrSupportedDbLayersExtensions << QStringLiteral( "gpkg" ) << QStringLiteral( "sqlite" ) << QStringLiteral( "db" ) << QStringLiteral( "gdb" ) << QStringLiteral( "kml" );
-  QStringList ogrSupportedDbDriverNames;
-  ogrSupportedDbDriverNames << QStringLiteral( "GPKG" ) << QStringLiteral( "db" ) << QStringLiteral( "gdb" );
+  static QStringList sOgrSupportedDbLayersExtensions { QStringLiteral( "gpkg" ),
+      QStringLiteral( "sqlite" ),
+      QStringLiteral( "db" ),
+      QStringLiteral( "gdb" ),
+      QStringLiteral( "kml" ) };
+  static QStringList sOgrSupportedDbDriverNames { QStringLiteral( "GPKG" ),
+      QStringLiteral( "db" ),
+      QStringLiteral( "gdb" ) };
 
   // Fast track: return item without testing if:
   // scanExtSetting or zipfile and scan zip == "Basic scan"
@@ -666,7 +750,7 @@ QgsDataItem *QgsOgrDataItemProvider::createDataItem( const QString &pathIn, QgsD
     // Handle collections
     // Check if the layer has sublayers by comparing the extension
     QgsDataItem *item = nullptr;
-    if ( ! ogrSupportedDbLayersExtensions.contains( suffix ) )
+    if ( ! sOgrSupportedDbLayersExtensions.contains( suffix ) )
     {
       item = new QgsOgrLayerItem( parentItem, name, path, path, QgsLayerItem::Vector );
     }
@@ -714,7 +798,7 @@ QgsDataItem *QgsOgrDataItemProvider::createDataItem( const QString &pathIn, QgsD
   {
     item = new QgsGeoPackageCollectionItem( parentItem, name, path );
   }
-  else if ( numLayers > 1 || ogrSupportedDbDriverNames.contains( driverName ) )
+  else if ( numLayers > 1 || sOgrSupportedDbDriverNames.contains( driverName ) )
   {
     item = new QgsOgrDataCollectionItem( parentItem, name, path );
   }

src/providers/ogr/qgsogrdataitems.h

@@ -100,6 +100,12 @@ class QgsOgrDataCollectionItem : public QgsDataCollectionItem
      */
     static bool createConnection( const QString &name, const QString &extensions, const QString &ogrDriverName );
 
+#ifdef HAVE_GUI
+    QList<QAction *> actions( QWidget *parent ) override;
+
+    static void deleteCollection( const QString &path, QPointer< QgsDataItem > parent );
+#endif
+
 };
 
 //! Provider for OGR root data item