Look for and load plugins from the users .qgis directory.

gsherman · gsherman · commit 2279ebb0c2dd · 2007-10-22T02:35:21.000Z
Patch from Matthew Perry, ticket #781 git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@7282 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -1563,14 +1563,13 @@ void QgisApp::restoreSessionPlugins(QString thePluginDirString)
   if (QgsPythonUtils::isEnabled())
   {
   
-    // check for python plugins
-    QDir pluginDir(QgsPythonUtils::pluginsPath(), "*",
-                  QDir::Name | QDir::IgnoreCase, QDir::Dirs | QDir::NoDotAndDotDot);
-  
-    for (uint i = 0; i < pluginDir.count(); i++)
+    // check for python plugins system-wide
+    QStringList pluginList = QgsPythonUtils::pluginList();
+
+    for (int i = 0; i < pluginList.size(); i++)
     {
-      QString packageName = pluginDir[i];
-      
+      QString packageName = pluginList[i];
+   
       // import plugin's package
       if (!QgsPythonUtils::loadPlugin(packageName))
         continue;
@@ -1596,7 +1595,6 @@ void QgisApp::restoreSessionPlugins(QString thePluginDirString)
         loadPythonPlugin(packageName, pluginName);
       }
     }
-  
   }
 #endif
 }
diff --git a/src/app/qgspluginmanager.cpp b/src/app/qgspluginmanager.cpp
@@ -83,14 +83,13 @@ void QgsPluginManager::getPythonPluginDescriptions()
   if (!QgsPythonUtils::isEnabled())
     return;
   
-  // look for plugins
-  QDir pluginDir(QgsPythonUtils::pluginsPath(), "*",
-                 QDir::Name | QDir::IgnoreCase, QDir::Dirs | QDir::NoDotAndDotDot);
-
-  for (uint i = 0; i < pluginDir.count(); i++)
+  // look for plugins systemwide
+  QStringList pluginList = QgsPythonUtils::pluginList();
+  
+  for (int i = 0; i < pluginList.size(); i++)
   {
-    QString packageName = pluginDir[i];
-    
+    QString packageName = pluginList[i];
+
     // import plugin's package
     QgsPythonUtils::loadPlugin(packageName);
     
@@ -125,7 +124,6 @@ void QgsPluginManager::getPythonPluginDescriptions()
         pl->setOn(true);
       }
     }
-  
   }
 #endif
 }
diff --git a/src/app/qgspythonutils.cpp b/src/app/qgspythonutils.cpp
@@ -24,7 +24,8 @@
 #include "qgslogger.h"
 
 #include <QMessageBox>
-
+#include <QStringList>
+#include <QDir>
 
 QString QgsPythonUtils::mPluginsPath;
 PyObject* QgsPythonUtils::mMainModule;
@@ -47,7 +48,7 @@ void QgsPythonUtils::initPython(QgisInterface* interface)
   
   // expect that bindings are installed locally, so add the path to modules
   // also add path to plugins
-  runString("sys.path = [\"" + pythonPath() + "\", \"" + pluginsPath() + "\"] + sys.path");
+  runString("sys.path = [\"" + homePluginsPath()  + "\", \"" + pythonPath() + "\", \"" + pluginsPath() + "\"] + sys.path");
 
   // import SIP
   if (!runString("from sip import wrapinstance, unwrapinstance"))
@@ -284,6 +285,32 @@ QString QgsPythonUtils::pluginsPath()
   return pythonPath() + "/plugins";
 }
 
+QString QgsPythonUtils::homePluginsPath()
+{
+  return QgsApplication::qgisSettingsDirPath() + "/python/plugins/";
+}
+
+QStringList QgsPythonUtils::pluginList()
+{
+  QDir pluginDir(QgsPythonUtils::pluginsPath(), "*",
+                 QDir::Name | QDir::IgnoreCase, QDir::Dirs | QDir::NoDotAndDotDot);
+
+  QDir homePluginDir(QgsPythonUtils::homePluginsPath(), "*",
+		     QDir::Name | QDir::IgnoreCase, QDir::Dirs | QDir::NoDotAndDotDot);
+
+  QStringList pluginList = pluginDir.entryList();
+
+  for (uint i = 0; i < homePluginDir.count(); i++)
+  {
+    QString packageName = homePluginDir[i];
+    if(!pluginList.contains(packageName))
+        pluginList.append(packageName); 
+
+  }
+
+  return pluginList;
+}
+
 QString QgsPythonUtils::getPluginMetadata(QString pluginName, QString function)
 {
   QString command = pluginName + "." + function + "()";
diff --git a/src/app/qgspythonutils.h b/src/app/qgspythonutils.h
@@ -15,6 +15,7 @@
 /* $Id$ */
 
 #include <QString>
+#include <QStringList>
 
 // forward declaration for PyObject
 #ifndef PyObject_HEAD
@@ -84,7 +85,13 @@ class QgsPythonUtils
     
     //! return current path for python plugins
     static QString pluginsPath();
-    
+
+    //! return current path for home directory python plugins
+    static QString homePluginsPath();
+
+    //! return list of all available python plugins
+    static QStringList pluginList();
+        
     //! load python plugin (import)
     static bool loadPlugin(QString packageName);
     

Original file line number	Diff line number	Diff line change
`@@ -1563,14 +1563,13 @@ void QgisApp::restoreSessionPlugins(QString thePluginDirString)`
`1563`	`1563`	`if (QgsPythonUtils::isEnabled())`
`1564`	`1564`	`{`
`1565`	`1565`
`1566`		`- // check for python plugins`
`1567`		`- QDir pluginDir(QgsPythonUtils::pluginsPath(), "*",`
`1568`		`- QDir::Name \| QDir::IgnoreCase, QDir::Dirs \| QDir::NoDotAndDotDot);`
`1569`		`-`
`1570`		`- for (uint i = 0; i < pluginDir.count(); i++)`
	`1566`	`+ // check for python plugins system-wide`
	`1567`	`+ QStringList pluginList = QgsPythonUtils::pluginList();`
	`1568`	`+`
	`1569`	`+ for (int i = 0; i < pluginList.size(); i++)`
`1571`	`1570`	`{`
`1572`		`- QString packageName = pluginDir[i];`
`1573`		`-`
	`1571`	`+ QString packageName = pluginList[i];`
	`1572`	`+`
`1574`	`1573`	`// import plugin's package`
`1575`	`1574`	`if (!QgsPythonUtils::loadPlugin(packageName))`
`1576`	`1575`	`continue;`
`@@ -1596,7 +1595,6 @@ void QgisApp::restoreSessionPlugins(QString thePluginDirString)`
`1596`	`1595`	`loadPythonPlugin(packageName, pluginName);`
`1597`	`1596`	`}`
`1598`	`1597`	`}`
`1599`		`-`
`1600`	`1598`	`}`
`1601`	`1599`	`#endif`
`1602`	`1600`	`}`
Original file line number	Diff line number	Diff line change
`@@ -83,14 +83,13 @@ void QgsPluginManager::getPythonPluginDescriptions()`
`83`	`83`	`if (!QgsPythonUtils::isEnabled())`
`84`	`84`	`return;`
`85`	`85`
`86`		`- // look for plugins`
`87`		`- QDir pluginDir(QgsPythonUtils::pluginsPath(), "*",`
`88`		`- QDir::Name \| QDir::IgnoreCase, QDir::Dirs \| QDir::NoDotAndDotDot);`
`89`		`-`
`90`		`- for (uint i = 0; i < pluginDir.count(); i++)`
	`86`	`+ // look for plugins systemwide`
	`87`	`+ QStringList pluginList = QgsPythonUtils::pluginList();`
	`88`	`+`
	`89`	`+ for (int i = 0; i < pluginList.size(); i++)`
`91`	`90`	`{`
`92`		`- QString packageName = pluginDir[i];`
`93`		`-`
	`91`	`+ QString packageName = pluginList[i];`
	`92`	`+`
`94`	`93`	`// import plugin's package`
`95`	`94`	`QgsPythonUtils::loadPlugin(packageName);`
`96`	`95`
`@@ -125,7 +124,6 @@ void QgsPluginManager::getPythonPluginDescriptions()`
`125`	`124`	`pl->setOn(true);`
`126`	`125`	`}`
`127`	`126`	`}`
`128`		`-`
`129`	`127`	`}`
`130`	`128`	`#endif`
`131`	`129`	`}`