Ensure that QgsMimeDataUtils::Uri::filePath is always set for file ba…

…sed items
qgis · Aug 12, 2021 · b4ef3a3 · b4ef3a3
1 parent 20aff0b
commit b4ef3a3
Show file tree

Hide file tree

Showing 10 changed files with 43 additions and 18 deletions.
diff --git a/src/app/qgsappbrowserproviders.cpp b/src/app/qgsappbrowserproviders.cpp
@@ -102,6 +102,7 @@ QgsMimeDataUtils::Uri QgsQlrDataItem::mimeUri() const
   u.providerKey = QStringLiteral( "qlr" );
   u.name = name();
   u.uri = path();
+  u.filePath = path();
   return u;
 }
 
@@ -222,6 +223,7 @@ QgsMimeDataUtils::Uri QgsQptDataItem::mimeUri() const
   u.providerKey = QStringLiteral( "qpt" );
   u.name = name();
   u.uri = path();
+  u.filePath = path();
   return u;
 }
 
@@ -266,6 +268,7 @@ QgsMimeDataUtils::Uri QgsPyDataItem::mimeUri() const
   u.providerKey = QStringLiteral( "py" );
   u.name = name();
   u.uri = path();
+  u.filePath = path();
   return u;
 }
 
@@ -369,6 +372,7 @@ QgsMimeDataUtils::Uri QgsStyleXmlDataItem::mimeUri() const
   u.providerKey = QStringLiteral( "style_xml" );
   u.name = name();
   u.uri = path();
+  u.filePath = path();
   return u;
 }
 

diff --git a/src/core/browser/qgsbrowsermodel.cpp b/src/core/browser/qgsbrowsermodel.cpp
@@ -665,8 +665,12 @@ QMimeData *QgsBrowserModel::mimeData( const QModelIndexList &indexes ) const
     {
       QgsDataItem *ptr = reinterpret_cast< QgsDataItem * >( index.internalPointer() );
       const QgsMimeDataUtils::UriList uris = ptr->mimeUris();
-      for ( const auto &uri : std::as_const( uris ) )
+      for ( QgsMimeDataUtils::Uri uri : std::as_const( uris ) )
       {
+        if ( ptr->capabilities2() & Qgis::BrowserItemCapability::ItemRepresentsFile )
+        {
+          uri.filePath = ptr->path();
+        }
         lst.append( uri );
       }
     }

diff --git a/src/core/browser/qgsdataitem.cpp b/src/core/browser/qgsdataitem.cpp
@@ -512,7 +512,20 @@ bool QgsDataItem::handleDoubleClick()
 
 QgsMimeDataUtils::Uri QgsDataItem::mimeUri() const
 {
-  return mimeUris().isEmpty() ? QgsMimeDataUtils::Uri() : mimeUris().first();
+  return mimeUris().isEmpty() ? QgsMimeDataUtils::Uri() : mimeUris().constFirst();
+}
+
+QgsMimeDataUtils::UriList QgsDataItem::mimeUris() const
+{
+  if ( capabilities2() & Qgis::BrowserItemCapability::ItemRepresentsFile )
+  {
+    QgsMimeDataUtils::Uri uri;
+    uri.uri = path();
+    uri.filePath = path();
+    return { uri };
+  }
+
+  return {};
 }
 
 bool QgsDataItem::setCrs( const QgsCoordinateReferenceSystem &crs )

diff --git a/src/core/browser/qgsdataitem.h b/src/core/browser/qgsdataitem.h
@@ -269,7 +269,7 @@ class CORE_EXPORT QgsDataItem : public QObject
      * Items that return valid URI will be returned in mime data when dragging a selection from browser model.
      * \since QGIS 3.18
      */
-    virtual QgsMimeDataUtils::UriList mimeUris() const { return QgsMimeDataUtils::UriList(); }
+    virtual QgsMimeDataUtils::UriList mimeUris() const;
 
     /**
      * Writes the selected crs into data source. The original data source will be modified when calling this

diff --git a/src/core/browser/qgsdirectoryitem.cpp b/src/core/browser/qgsdirectoryitem.cpp
@@ -502,6 +502,7 @@ QgsMimeDataUtils::UriList QgsDirectoryItem::mimeUris() const
   u.layerType = QStringLiteral( "directory" );
   u.name = mName;
   u.uri = mDirPath;
+  u.filePath = path();
   return { u };
 }
 

diff --git a/src/core/browser/qgsfilebaseddataitemprovider.cpp b/src/core/browser/qgsfilebaseddataitemprovider.cpp
@@ -65,20 +65,6 @@ QVector<QgsDataItem *> QgsProviderSublayerItem::createChildren()
   return children;
 }
 
-QgsMimeDataUtils::UriList QgsProviderSublayerItem::mimeUris() const
-{
-  QgsMimeDataUtils::UriList uris = QgsLayerItem::mimeUris();
-  // add file path were appropriate
-  if ( capabilities2() & Qgis::BrowserItemCapability::ItemRepresentsFile )
-  {
-    for ( int i = 0; i < uris.size(); ++i )
-    {
-      uris[i].filePath = path();
-    }
-  }
-  return uris;
-}
-
 Qgis::BrowserLayerType QgsProviderSublayerItem::layerTypeFromSublayer( const QgsProviderSublayerDetails &sublayer )
 {
   switch ( sublayer.type() )

diff --git a/src/core/browser/qgsfilebaseddataitemprovider.h b/src/core/browser/qgsfilebaseddataitemprovider.h
@@ -55,7 +55,6 @@ class CORE_EXPORT QgsProviderSublayerItem final: public QgsLayerItem
     QgsProviderSublayerItem( QgsDataItem *parent, const QString &name, const QgsProviderSublayerDetails &details );
     QString layerName() const override;
     QVector<QgsDataItem *> createChildren() override;
-    QgsMimeDataUtils::UriList mimeUris() const override;
 
   private:
 

diff --git a/src/core/browser/qgslayeritem.cpp b/src/core/browser/qgslayeritem.cpp
@@ -276,5 +276,11 @@ QgsMimeDataUtils::UriList QgsLayerItem::mimeUris() const
   u.uri = uri();
   u.supportedCrs = supportedCrs();
   u.supportedFormats = supportedFormats();
+
+  if ( capabilities2() & Qgis::BrowserItemCapability::ItemRepresentsFile )
+  {
+    u.filePath = path();
+  }
+
   return { u };
 }
diff --git a/src/core/browser/qgsprojectitem.cpp b/src/core/browser/qgsprojectitem.cpp
@@ -33,6 +33,12 @@ QgsMimeDataUtils::UriList QgsProjectItem::mimeUris() const
   u.layerType = QStringLiteral( "project" );
   u.name = mName;
   u.uri = mPath;
+
+  if ( capabilities2() & Qgis::BrowserItemCapability::ItemRepresentsFile )
+  {
+    u.filePath = path();
+  }
+
   return { u };
 }
 
diff --git a/src/core/providers/ogr/qgsgeopackagedataitems.cpp b/src/core/providers/ogr/qgsgeopackagedataitems.cpp
@@ -448,5 +448,11 @@ QgsMimeDataUtils::UriList QgsGeoPackageCollectionItem::mimeUris() const
   QgsMimeDataUtils::Uri collectionUri;
   collectionUri.uri = path().replace( QLatin1String( "gpkg:/" ), QString() );
   collectionUri.layerType = QStringLiteral( "collection" );
+
+  if ( capabilities2() & Qgis::BrowserItemCapability::ItemRepresentsFile )
+  {
+    collectionUri.filePath = path();
+  }
+
   return { collectionUri };
 }