[processing] improvements for new mechanism for adding algorithms

Correctly remove algorithms on plugin unload
qgis · May 24, 2016 · 3607e269c6695eedc3cfe6285344905062125d32 · 3607e26
1 parent bc75862
commit 3607e269c6695eedc3cfe6285344905062125d32
Unified Split

Showing with 11 additions and 4 deletions.

+2 −2 python/plugins/processing/algs/examplescripts/ProcessingExampleScriptsPlugin.py

0 python/plugins/processing/algs/examplescripts/{ → scripts}/examplescript.py

+9 −2 python/plugins/processing/core/Processing.py
diff --git a/python/plugins/processing/algs/examplescripts/ProcessingExampleScriptsPlugin.py b/python/plugins/processing/algs/examplescripts/ProcessingExampleScriptsPlugin.py
@@ -32,7 +32,7 @@
 class ProcessingExampleScriptsPlugin:
 
     def initGui(self):
-        Processing.addScripts(self, os.path.dirname(__file__))
+        Processing.addScripts(os.path.join(os.path.dirname(__file__), "scripts"))
 
     def unload(self):
-        pass
+        Processing.removeScripts(os.path.join(os.path.dirname(__file__), "scripts"))
diff --git a/...sing/algs/examplescripts/examplescript.py → ...s/examplescripts/scripts/examplescript.py b/...sing/algs/examplescripts/examplescript.py → ...s/examplescripts/scripts/examplescript.py
diff --git a/python/plugins/processing/core/Processing.py b/python/plugins/processing/core/Processing.py
@@ -150,9 +150,16 @@ def addScripts(folder):
         provider.externalAlgs.extend(scripts)     
         Processing.reloadProvider("qgis")
 
-    @staticmethod 
+
+    @staticmethod
     def removeScripts(folder):
-        pass
+        provider = Processing.getProviderFromName("qgis")
+        for alg in provider.externalAlgs[::-1]:
+            path = os.path.dirname(alg.descriptionFile)
+            if path == folder:
+                provider.externalAlgs.remove(alg)   
+        Processing.reloadProvider("qgis")
+
 
     @staticmethod
     def updateAlgsList():