Support basic zipped plugin file name version suffix

opengisch · Jun 8, 2024 · 02a7858 · 02a7858 · qfield-fairy · Jun 8, 2024
1 parent 6690c68
commit 02a7858
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/core/pluginmanager.cpp b/src/core/pluginmanager.cpp
@@ -375,7 +375,9 @@ void PluginManager::installFromUrl( const QString &url )
             // Insure no previous version is running
             disableAppPlugin( fileInfo.completeBaseName() );
 
-            QDir pluginDirectory = QStringLiteral( "%1/plugins/%2" ).arg( dataDir, fileInfo.completeBaseName() );
+            // Remove the .zip suffix as well as version information (e.g. myplugin-v1.0.zip becomes myplugin)
+            const QString pluginDirectoryName = fileName.replace( QRegularExpression( "(-v?\\d+(\\.\\d+)*)?.zIP$", QRegularExpression::CaseInsensitiveOption ), QString() );
+            QDir pluginDirectory = QStringLiteral( "%1/plugins/%2" ).arg( dataDir, pluginDirectoryName );
             if ( pluginDirectory.exists() )
             {
               pluginDirectory.removeRecursively();