Refactor plugin configuration

[cascardo/ipsilon.git] / ipsilon / info / common.py

diff --git a/ipsilon/info/common.py b/ipsilon/info/common.py
index 62f80ef..586b9e5 100755 (executable)
--- a/ipsilon/info/common.py
+++ b/ipsilon/info/common.py
@@ -5,45 +5,44 @@
 # See the file named COPYING for the project license
 
 from ipsilon.util.log import Log
-from ipsilon.util.plugin import PluginLoader, PluginObject
-from ipsilon.util.plugin import PluginInstaller
+from ipsilon.util.plugin import PluginInstaller, PluginLoader
+from ipsilon.util.plugin import PluginObject, PluginConfig
 
 
-class InfoProviderBase(PluginObject, Log):
+class InfoProviderBase(PluginConfig, PluginObject):
 
     def __init__(self):
-        super(InfoProviderBase, self).__init__()
+        PluginConfig.__init__(self)
+        PluginObject.__init__(self)
         self._site = None
+        self.is_enabled = False
 
     def get_user_attrs(self, user):
         raise NotImplementedError
 
-    @property
-    def is_enabled(self):
-        if self._site:
-            return self in self._site[FACILITY]['enabled']
-        return False
-
     def enable(self, site):
-        self._site = site
-        plugins = site[FACILITY]
-        if self in plugins['enabled']:
+        if self.is_enabled:
             return
 
+        if not self._site:
+            self._site = site
+        plugins = self._site[FACILITY]
+
         # configure self
         if self.name in plugins['config']:
-            self.set_config(plugins['config'][self.name])
+            self.import_config(plugins['config'][self.name])
 
         plugins['enabled'].append(self)
+        self.is_enabled = True
         self.debug('Info plugin enabled: %s' % self.name)
 
     def disable(self, site):
-        self._site = site
-        plugins = site[FACILITY]
-        if self not in plugins['enabled']:
+        if not self.is_enabled:
             return
 
+        plugins = self._site[FACILITY]
         plugins['enabled'].remove(self)
+        self.is_enabled = False
         self.debug('Info plugin disabled: %s' % self.name)