Changeset 269

Timestamp:

09/15/2010 10:14:15 AM (12 years ago)

Author:

marcus

Message:

Configuration file work finished in some way (only reading and parsing).

File:

• SHX/trunk/src/SeismicHandler/modules/runtime.py (modified) (4 diffs)

SHX/trunk/src/SeismicHandler/modules/runtime.py

@@ -25 +25 @@
 import os
 import ConfigParser
+import warnings
 from SeismicHandler.basics import Property, Singleton, AttribDict
 
@@ -78 +79 @@
 
     def __init__(self):
-        self.readConfig()
+        if not self.__configuration:
+            self.readConfig()
 
     def readConfig(self):
@@ -88 +90 @@
         2. /etc/
         3. $HOME/.shx/
-        """
-
-        dirs = {
-            "SHX": os.path.abspath(__file__).rsplit(os.path.sep, 2)[0],
-            "ETC": "/etc/SeismicHandler",
-        }
+        All configurations files found are processed in this order!
+
+        Finally the variable "conf" contains the full parsed configuration and
+        "fullconfig" contains the merged configuration with replacements.
+        """
+
+        # helper function
+        def __handlePlaceholdersVars(values, replacevars=False):
+            """
+            Replace placeholders in config file.
+            """
+
+            # split values
+            if type(values) != list:
+                values = map(str.strip, values.split(","))
+            
+            ret = []
+            for v in values:
+                if v.startswith("["):
+                    # replacement requested
+                    for d in replace.keys():
+                        if v.startswith("[%s]" % d):
+                            # do replacement
+                            ret.append(v.replace("[%s]" % d, replace[d]))
+                elif replacevars and v.startswith("$"):
+                    # variable substitution
+                    try:
+                        ret.extend(vars[v.lower()])
+                    except KeyError:
+                        warnings.warn("Variable '%s' not found!" % v, SyntaxWarning)
+                else:
+                    ret.append(v)
+
+            return ret
+
+        # "main" function
+        dirs_check = [
+            ["SHX", os.path.abspath(__file__).rsplit(os.path.sep, 2)[0]],
+            ["ETC", "/etc/SeismicHandler"], # XXX not portable!
+        ]
 
         dir_home = os.getenv("HOME", None)
 
         if dir_home:
-            dirs["PRIVATE"] = os.path.join(dir_home, ".shx")
-
-        for d in dirs.values():
-            src = os.path.join(d, "shx.conf")
+            dirs_check.append(["PRIVATE", os.path.join(dir_home, ".shx")])
+            # XXX not portable!
+
+        dirs = []
+        replace = {}
+        for d in dirs_check:
+            src = os.path.join(d[1], "shx.conf")
+            replace[d[0]] = d[1]
             if os.path.exists(src):
-                break
-
-        config = ConfigParser.SafeConfigParser()
-        if not config.read(src):
-            raise Exception("configuration file not found!")
+                dirs.append(src)
 
         conf = AttribDict()
-        for s in config.sections():
-            conf[s] = AttribDict()
-            for i in config.items(s):
-                conf[s][i[0]] = self.__handlePlaceholders(map(str.strip, \
-                                                         i[1].split(",")), dirs)
-
-            # check for include statement
-            if "include" in conf[s]:
-
-                # include sub configfile if requested
-                extra = ConfigParser.SafeConfigParser()
-                for e in conf[s]["include"]:
-                    extra.read(e)
-
-                    # only include current section
-                    if not extra.has_section(s):
-                        break
-
-                    for ie in extra.items(s):
-                        conf[s][ie[0]] = self.__handlePlaceholders(ie[1].split(","), dirs)
-
-        print conf
-
-    def __handlePlaceholders(self, values, dirs):
-        """
-        Replace placeholders in config file.
-        """
-
-        ret = []
-        for v in values:
-            if v.startswith("["):
-                # replacement requested
-                for d in dirs.keys():
-                    if v.startswith("[%s]" % d):
-                        # do replacement
-                        ret.append(v.replace("[%s]" % d, dirs[d]))
-
-            else:
-                ret.append(v)
-
-        return ret
+        vars = AttribDict()
+
+        # includes merged configuration without replacements
+        fullconfig = ConfigParser.SafeConfigParser()
+
+        for src in dirs:
+            config = ConfigParser.SafeConfigParser()
+            config.read(src)
+
+            for s in config.sections():
+                if not fullconfig.has_section(s):
+                    fullconfig.add_section(s)
+
+                if s not in conf.keys():
+                    conf[s] = AttribDict()
+
+                for i in config.items(s):
+                    fullconfig.set(s, *i)
+                    
+                    # check for variable definition
+                    if i[0].startswith("$"):
+                        vars[i[0].lower()] = __handlePlaceholdersVars(i[1])
+                    else:
+                        conf[s][i[0]] = __handlePlaceholdersVars(i[1])
+
+                # check for include statement
+                if "include" in conf[s]:
+
+                    # include sub configfile if requested
+                    extra = ConfigParser.SafeConfigParser()
+                    for e in conf[s]["include"]:
+                        extra.read(e)
+
+                        # only include current section
+                        if not extra.has_section(s):
+                            break
+
+                        for ie in extra.items(s):
+                            fullconfig.set(s, *ie)
+                            conf[s][ie[0]] = __handlePlaceholdersVars(ie[1])
+
+                    del conf[s]["include"]
+                    fullconfig.remove_option(s, "include")
+
+        # since configparser doesn't preserve order of entries, variables will
+        # be processed last.
+        for s in conf:
+            for i in conf[s]:
+                conf[s][i] = __handlePlaceholdersVars(conf[s][i], True)
+                
+        self.__configuration = conf
+        self.__fullconfig = fullconfig
 
     def __getattr__(self, name):
@@ -156 +203 @@
             return getattr(self, "_Switches")[name[2:]]
         else:
-#            return self.__class__.__dict__[name]
             return object.__getattribute__(self, name)