sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-12-06 00:03:16 -05:00
Code Issues Packages Projects Releases Wiki Activity

Automatically removed attached layer sources when layer is deleted

Browse Source
This commit is contained in:
Sandro Mani 2021-12-15 11:40:17 +01:00
parent 68a1470ea1
commit 792ce7f962
4 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
python/core/auto_generated/project/qgsproject.sip.in
View File

@ -1273,6 +1273,11 @@ Attaches a file to the project
:return: The path to the file where the contents can be written to. :return: The path to the file where the contents can be written to.
.. note::
If the attachment file is used as a source for a project layer, the attachment will be removed
automatically when the layer is deleted.
.. versionadded:: 3.22 .. versionadded:: 3.22
%End %End

2
src/core/project/qgsproject.h
View File

@ -1341,6 +1341,8 @@ class CORE_EXPORT QgsProject : public QObject, public QgsExpressionContextGenera
* Attaches a file to the project * Attaches a file to the project
* \param nameTemplate Any filename template, used as a basename for attachment file, i.e. "myfile.ext" * \param nameTemplate Any filename template, used as a basename for attachment file, i.e. "myfile.ext"
* \return The path to the file where the contents can be written to. * \return The path to the file where the contents can be written to.
* \note If the attachment file is used as a source for a project layer, the attachment will be removed
* automatically when the layer is deleted.
* \since QGIS 3.22 * \since QGIS 3.22
*/ */
QString createAttachedFile( const QString &nameTemplate ); QString createAttachedFile( const QString &nameTemplate );

5
src/core/qgsmaplayer.cpp
View File

@ -98,6 +98,11 @@ QgsMapLayer::QgsMapLayer( QgsMapLayerType type,
QgsMapLayer::~QgsMapLayer() QgsMapLayer::~QgsMapLayer()
{ {
if ( project() && project()->pathResolver().writePath( mDataSource ).startsWith( "attachment:" ) )
{
project()->removeAttachedFile( mDataSource );
}
delete m3DRenderer; delete m3DRenderer;
delete mLegend; delete mLegend;
delete mStyleManager; delete mStyleManager;

14
tests/src/core/testqgsproject.cpp
View File

@ -812,6 +812,13 @@ void TestQgsProject::testAttachmentsQgs()
QVERIFY( p2.attachedFiles().size() == 1 ); QVERIFY( p2.attachedFiles().size() == 1 );
QVERIFY( p2.mapLayers().size() == 1 ); QVERIFY( p2.mapLayers().size() == 1 );
QVERIFY( p2.mapLayer( p2.mapLayers().firstKey() )->source() == p2.attachedFiles().first() ); QVERIFY( p2.mapLayer( p2.mapLayers().firstKey() )->source() == p2.attachedFiles().first() );
// Verify that attachment file is removed when layer is deleted
QgsMapLayer *p2layer = p2.mapLayer( p2.mapLayers().firstKey() );
QString path = p2layer->source();
QVERIFY( QFile( path ).exists() );
p2.removeMapLayer( p2layer->id() );
QVERIFY( !QFile( path ).exists() );
} }
} }
@ -882,6 +889,13 @@ void TestQgsProject::testAttachmentsQgz()
QVERIFY( p2.attachedFiles().size() == 1 ); QVERIFY( p2.attachedFiles().size() == 1 );
QVERIFY( p2.mapLayers().size() == 1 ); QVERIFY( p2.mapLayers().size() == 1 );
QVERIFY( p2.mapLayer( p2.mapLayers().firstKey() )->source() == p2.attachedFiles().first() ); QVERIFY( p2.mapLayer( p2.mapLayers().firstKey() )->source() == p2.attachedFiles().first() );
// Verify that attachment file is removed when layer is deleted
QgsMapLayer *p2layer = p2.mapLayer( p2.mapLayers().firstKey() );
QString path = p2layer->source();
QVERIFY( QFile( path ).exists() );
p2.removeMapLayer( p2layer->id() );
QVERIFY( !QFile( path ).exists() );
} }
} }