X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Futil%2Fconfig.py;h=c25ec4422184867a69a690a4ca1e33ad2bbdfa50;hb=8ece6aaf557800371b7366e22af7a6ab04614d10;hp=cd3314f498c4c750933118d35dcb97ed4c840301;hpb=8c92edf8a2aa28dca57bb8a4eb0b1c187dd2e039;p=sfa.git

diff --git a/sfa/util/config.py b/sfa/util/config.py
index cd3314f4..c25ec442 100644
--- a/sfa/util/config.py
+++ b/sfa/util/config.py
@@ -12,6 +12,12 @@ default_config = \
 """
 """
 
+def isbool(v):
+    return v.lower() in ("true", "false")
+
+def str2bool(v):
+    return v.lower() in ("true", "1")             
+
 class Config:
   
     def __init__(self, config_file='/etc/sfa/sfa_config'):
@@ -45,16 +51,16 @@ DO NOT EDIT. This file was automatically generated at
 
     def load(self, filename):
         if filename:
-            if filename.endswith('.xml'):
-                try:
-                    self.load_xml(filename)
-                except:
-                    self.config.read(filename)
-            else:
+            try:
                 self.config.read(filename)
-        self._files.append(filename)
-        self.set_attributes()
-                
+            except ConfigParser.MissingSectionHeaderError:
+                if filename.endswith('.xml'):
+                    self.load_xml(filename)
+                else:
+                    self.load_shell(filename)
+            self._files.append(filename)
+            self.set_attributes()
+
     def load_xml(self, filename):
         xml = XML(filename)
         categories = xml.xpath('//configuration/variables/category')
@@ -70,8 +76,25 @@ DO NOT EDIT. This file was automatically generated at
                     value = ""
                 self.config.set(section_name, option_name, value)
          
-
-    def locate_varname(self, varname):
+    def load_shell(self, filename):
+        f = open(filename, 'r')
+        for line in f:
+            try:
+                if line.startswith('#'):
+                    continue
+                parts = line.strip().split("=")
+                if len(parts) < 2:
+                    continue
+                option = parts[0]
+                value = parts[1].replace('"', '').replace("'","")
+                section, var = self.locate_varname(option, strict=False)
+                if section and var:
+                    self.set(section, var, value)
+            except:
+                pass
+        f.close()               
+
+    def locate_varname(self, varname, strict=True):
         varname = varname.lower()
         sections = self.config.sections()
         section_name = ""
@@ -80,8 +103,8 @@ DO NOT EDIT. This file was automatically generated at
             if varname.startswith(section.lower()) and len(section) > len(section_name):
                 section_name = section.lower()
                 var_name = varname.replace(section_name, "")[1:]
-        if not self.config.has_option(section_name, var_name):
-            raise ConfigParser.NoOptionError(varname, section_name)
+        if strict and not self.config.has_option(section_name, var_name):
+            raise ConfigParser.NoOptionError(var_name, section_name)
         return (section_name, var_name)             
 
     def set_attributes(self):
@@ -90,9 +113,62 @@ DO NOT EDIT. This file was automatically generated at
             for item in self.config.items(section):
                 name = "%s_%s" % (section, item[0])
                 value = item[1]
+                if isbool(value):
+                    value = str2bool(value)
+                elif value.isdigit():
+                    value = int(value)    
                 setattr(self, name, value)
                 setattr(self, name.upper(), value)
-        
+
+    def variables(self):
+        """
+        Return all variables.
+
+        Returns:
+
+        variables = { 'category_id': (category, variablelist) }
+
+        category = { 'id': "category_identifier",
+                     'name': "Category name",
+                     'description': "Category description" }
+
+        variablelist = { 'variable_id': variable }
+
+        variable = { 'id': "variable_identifier",
+                     'type': "variable_type",
+                     'value': "variable_value",
+                     'name': "Variable name",
+                     'description': "Variable description" }
+        """
+
+        variables = {}
+        for section in self.config.sections():
+            category = {
+                'id': section,
+                'name': section,
+                'description': section,
+            }
+            variable_list = {}
+            for item in self.config.items(section):
+                var_name = item[0] 
+                name = "%s_%s" % (section, var_name)
+                value = item[1]
+                if isbool(value):
+                    value_type = bool
+                elif value.isdigit():
+                    value_type = int
+                else:
+                    value_type = str
+                variable = {
+                    'id': var_name,
+                    'type': value_type,
+                    'value': value,
+                    'name': name,
+                    'description': name,
+                }
+                variable_list[name] = variable
+            variables[section] = (category, variable_list)
+        return variables      
 
     def verify(self, config1, config2, validate_method):
         return True
@@ -100,6 +176,24 @@ DO NOT EDIT. This file was automatically generated at
     def validate_type(self, var_type, value):
         return True
 
+    @staticmethod
+    def is_xml(config_file):
+        try:
+            x = Xml(config_file)
+            return True     
+        except:
+            return False
+
+    @staticmethod
+    def is_ini(config_file):
+        try:
+            c = ConfigParser.ConfigParser()
+            c.read(config_file)
+            return True
+        except ConfigParser.MissingSectionHeaderError:
+            return False
+
+
     def dump(self, sections = []):
         sys.stdout.write(output_python())
 
@@ -127,8 +221,10 @@ DO NOT EDIT. This file was automatically generated at
                 # bash does not have the concept of NULL
                 if value:
                     option = "%s_%s" % (section.upper(), name.upper())
-                    if not value.isdigit() and not bool(value):
-                        value = "'%s'" % value  
+                    if isbool(value):
+                        value = str(str2bool(value))
+                    elif not value.isdigit():
+                        value = '"%s"' % value  
                     buf.write(option + "=" + value + os.linesep)
         return buf.getvalue()        
 
@@ -157,7 +253,7 @@ DO NOT EDIT. This file was automatically generated at
     def output_xml(self, encoding = "utf-8"):
         pass
 
-    def output_variables(self):
+    def output_variables(self, encoding="utf-8"):
         """
         Return list of all variable names.
         """