From bae95858aa0dacbabd82f598eb83ca70080608bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20H=C3=B6rist?= <philipp@hoerist.com>
Date: Wed, 10 Oct 2018 21:23:09 +0200
Subject: [PATCH] Dont overwrite user plugins with base plugins

- Dont load plugins without short_name
- Check with the short_name if a plugin is already loaded
---
 gajim/plugins/pluginmanager.py | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/gajim/plugins/pluginmanager.py b/gajim/plugins/pluginmanager.py
index 6fe8a4449..72d23b47f 100644
--- a/gajim/plugins/pluginmanager.py
+++ b/gajim/plugins/pluginmanager.py
@@ -110,7 +110,7 @@ class PluginManager(metaclass=Singleton):
         '''
 
         for path in reversed(configpaths.get_plugin_dirs()):
-            pc = PluginManager.scan_dir_for_plugins(path)
+            pc = self.scan_dir_for_plugins(path)
             self.add_plugins(pc)
 
     @log_calls('PluginManager')
@@ -137,7 +137,6 @@ class PluginManager(metaclass=Singleton):
         and adding class from reloaded module or ignoring adding plug-in?
         '''
         plugin = plugin_class()
-
         if plugin not in self.plugins:
             if not self._plugin_has_entry_in_global_config(plugin):
                 self._create_plugin_entry_in_global_config(plugin)
@@ -520,9 +519,8 @@ class PluginManager(metaclass=Singleton):
     def _set_plugin_active_in_global_config(self, plugin, active=True):
         app.config.set_per('plugins', plugin.short_name, 'active', active)
 
-    @staticmethod
     @log_calls('PluginManager')
-    def scan_dir_for_plugins(path, scan_dirs=True, package=False):
+    def scan_dir_for_plugins(self, path, scan_dirs=True, package=False):
         r'''
         Scans given directory for plugin classes.
 
@@ -584,6 +582,21 @@ class PluginManager(metaclass=Singleton):
                                 elem_name, exc_info=True)
                     continue
 
+            short_name = conf.get('info', 'short_name', fallback=None)
+            if short_name is None:
+                log.error('No short_name defined for %s', elem_name)
+
+            # Check if the plugin is already loaded
+            try:
+                for plugin in self.plugins:
+                    if plugin.short_name == short_name:
+                        raise PluginAlreadyLoaded(
+                            'Skip Plugin %s because its '
+                            'already loaded' % elem_name)
+            except PluginAlreadyLoaded as error:
+                log.warning(error)
+                continue
+
             min_v = conf.get('info', 'min_gajim_version', fallback=None)
             max_v = conf.get('info', 'max_gajim_version', fallback=None)
 
@@ -734,3 +747,7 @@ class PluginManager(metaclass=Singleton):
         for plugin in self.plugins:
             if plugin.__path__ in plugin_dir:
                 return plugin
+
+
+class PluginAlreadyLoaded(Exception):
+    pass