Changeset 815

Timestamp:

Jan 13, 2010, 5:32:53 PM (15 years ago)

Author:

slederer

Message:

Parsing von geschweiften Klammern verbessert

Location:

vanHelsing/trunk/src

Files:

• bcfg.py (modified) (5 diffs)
• resource.py (modified) (1 diff)

vanHelsing/trunk/src/bcfg.py

@@ -15 +15 @@
 rxp_item2 = re.compile('^\\s*(\\w[\\w ]*\\w+)\\s*\\=\\s*{(.*)}\\s*') # match key = { a = 1; b= 2}
 rxp_openbrace = re.compile('^\\s*(\\w[\\w ]*\\w+)\\s*\\=?\\s*\\{\\s*')    # match xxx {
+rxp_open = re.compile('^\\s*(\\w[\\w ]*\\w+)\\s*$')    # match xxx 
 rxp_closebrace = re.compile('[^{]*}.*')               # match }
 rxp_comment = re.compile('^\s*#.*')
@@ -49 +50 @@
     def getRoot(self):
         return self.resources
+
+    def addResource(self,resname,level,curRes):
+        try:
+                resClass = getattr(resource,resname);
+        except:
+                resClass = resource.Resource
+
+        newRes=resClass(level+1)
+        newRes.name=resname
+        curRes.add_item(newRes);
+        return newRes
 
     def parse(self,curRes,f,level):
@@ -92 +104 @@
                 #print "openbraceline"
                 resname = openbraceline.group(1)
-                try:
-                        resClass = getattr(resource,resname);
-                except:
-                        resClass = resource.Resource
-
-                newRes=resClass(level+1)
-                newRes.name=resname
-                curRes.add_item(newRes);
+                newRes=self.addResource(resname,level,curRes)
                 self.parse(newRes,f,level+1);
-
+                continue
+
+            open = rxp_open.match(line)
+            if open:
+                resname = open.group(1)
+                newRes=self.addResource(resname,level,curRes)
+                self.parse(newRes,f,level+1);
                 continue
 
@@ -166 +177 @@
        password += random.choice(charset)
     return password
+
+def createAllClientConfigs(dirdcfg):
+    clients=dirdcfg.getResourceByName("Client")
+    director=dirdcfg.getResourceByName("Director")[0]
+    dirdName=director.getName()
+
+    for c in clients:
+        clientName=c.getName()
+        if clientName!=None:
+            r=c.getByName("Password")
+            if len(r)>0:
+                clientPassword=r[0].value
+                clientPassword=clientPassword.replace('"','')
+            else:
+                clientPassword=""
+            filename=clientName+".conf"
+            fdcfg=FiledConfig(filename)
+            fdcfg.setDefaults(dirdName,clientPassword,clientName)
+            fdcfg.write()
+
  
 if __name__ == "__main__":
@@ -196 +227 @@
     fdcfg.write()
 
+    createAllClientConfigs(dirdcfg)
+
     sys.exit(0)

vanHelsing/trunk/src/resource.py

@@ -77 +77 @@
         return result
                           
+    def getName(self):
+        for i in self.items:
+            if i.name=="Name":
+                return i.value
+        return None
 
 class Root(Resource):