new frontend configuration system

weboob/tools/application.py

@@ -28,7 +28,7 @@ from weboob import Weboob
 class BaseApplication(object):
     APPNAME = ''
     CONFIG = {}
-    CONFDIR = '%s/.weboob/' % os.path.expanduser("~")
+    CONFDIR = os.path.join(os.path.expanduser('~'), '.weboob')
 
     def __init__(self):
         self.weboob = Weboob(self.APPNAME)
@@ -45,18 +45,16 @@ class BaseApplication(object):
         if klass is None:
             # load Config only here because some applications don't want
             # to depend on yaml and do not use this function
-            from weboob.tools.config import Config
-            klass = Config
+            from weboob.tools.config.yaml import YamlConfig
+            klass = YamlConfig
 
         if path is None:
-            path = self.CONFDIR + 'weboobrc'
+            path = os.path.join(self.CONFDIR, self.APPNAME)
         elif not path.startswith('/'):
-            path = self.CONFDIR + path
+            path = os.path.join(self.CONFDIR, path)
 
         self.config = klass(path)
-        self.config.load()
-        self.myconfig = self.CONFIG
-        self.myconfig.update(self.config.getfrontend(self.APPNAME))
+        self.config.load(self.CONFIG)
 
     def main(self, argv):
         """ Main function """

weboob/tools/config/iconfig.py

@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+
+"""
+Copyright(C) 2010  Romain Bignon
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, version 3 of the License.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+"""
+
+class ConfigError(Exception): pass
+
+class IConfig:
+    def load(self, default={}):
+        raise NotImplementedError()
+
+    def save(self):
+        raise NotImplementedError()
+
+    def set(self, *args):
+        raise NotImplementedError()
+
+    def get(self, *args, **kwargs):
+        raise NotImplementedError()

weboob/tools/config/yaml.py

@@ -21,16 +21,17 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 from __future__ import with_statement
 
 import yaml
-from logging import warning
 
-from weboob.iconfig import IConfig, ConfigError, BackendConfig
+from .iconfig import IConfig, ConfigError
 
-class Config(IConfig):
+class YamlConfig(IConfig):
     def __init__(self, path):
         self.path = path
         self.values = {}
 
-    def load(self):
+    def load(self, default={}):
+        self.values = default.copy()
+
         try:
             with open(self.path, 'r') as f:
                 self.values = yaml.load(f)
@@ -82,15 +83,3 @@ class Config(IConfig):
                 raise ConfigError()
 
         v[args[-2]] = args[-1]
-
-    def getfrontend(self, name):
-        return self.get('frontends', name, default={})
-
-    def getbackends(self):
-        d = {}
-        for key, value in self.get('backends', default={}).iteritems():
-            if not 'type' in value:
-                warning("Missing 'type' item in config of '%s' backend" % key)
-            else:
-                d[key] = BackendConfig(key, value['type'], value.get('config', {}))
-        return d