Changeset 799

Timestamp:

Oct 15, 2009, 6:37:56 PM (15 years ago)

Author:

slederer

Message:

Änderungen am Parser, so dass er funktioniert

Location:

vanHelsing/trunk/src

Files:

• bcfg.py (modified) (3 diffs)
• directive.py (modified) (3 diffs)
• resource.py (modified) (2 diffs)

vanHelsing/trunk/src/bcfg.py

@@ -11 +11 @@
 RESOURCE_TYPES = ('dird', 'console', 'filed', 'stored')
 
-rxp_item = re.compile('\s*(?P<Name>[\S]+)\s*=\s*(?P<Value>.*)$') # xxx = xxx matchen
-rxp_openbrace = re.compile('\s*(?P<Name>[\S ]+)=?\s+{.*')    # match xxx {
-rxp_closebrace = re.compile('.*}.*')               # match }
+rxp_item = re.compile('^\\s*(\\w[\\w ]*\\w+)\\s*\\=(.*)') # xxx = xxx matchen
+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_closebrace = re.compile('[^{]*}.*')               # match }
 rxp_comment = re.compile('^\s*#.*')
 
@@ -26 +27 @@
         self.filename = filename
         self.resources = resource.Resource(level=0)
+        self.resources.name="<root>"
 
     def read(self):
-        print "reading %s" % self.filename
-        self.parse()
-        print self.resources
+        self.parse(self.resources,open(self.filename,"r"),0)
+        #print self.resources
         
-    
     def write(self):
         pass
-    
-    def parse(self):
-        multiRes = set(['Run','File','Ip']) # entries, which can be multiple times in a ressource
-        f = open(self.filename)         
-        dirRes=[] # Liste der Director Ressourcen
-        curRes = self.resources
-        braceLevel = 0;
-        tmpRes = {}
-        treeindex=range(10)
-        treeindex[0]=curRes
-       
-        print resource.directives
-        
-        for line in f:
-                #print braceLevel,line
-            commentline = rxp_comment.match(line)
-            if commentline:
-                curRes.add_comment(line.strip())
+
+    def getResourceById(self,theid):
+        return self.resources.getById(theid)
+
+    def getResourceByName(self,name):
+        return self.resources.getByName(name)
+
+    def getRoot(self):
+        return self.resources
+
+    def parse(self,curRes,f,level):
+        #print "START",curRes.name
+
+        while True:
+            line=f.readline()
+            if not line:
+                break
+
+            inlinecomment=None
+         
+            commentStart=line.find("#")
+            if commentStart!=-1:
+                inlinecomment=line[commentStart:]
+                line=line[:commentStart].strip()
+                #curRes.add_comment(inlinecomment)
+
+            if rxp_closebrace.match(line):
+                #print "closebraceline"
+                break
+
+            item2 = rxp_item2.match(line)
+            if item2:
+                #print "item2"
+                name = item2.group(1)
+                value = item2.group(2)
+                #print "item:",name,value
+                newRes=resource.Resource(level+1)
+                newRes.name=name
+                newRes.value="{"+value+"}"
+                curRes.add_item(newRes)
                 continue
-            print braceLevel
+
             openbraceline = rxp_openbrace.match(line)
-            closebraceline = rxp_closebrace.match(line)
+            if openbraceline:
+                #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);
+                self.parse(newRes,f,level+1);
+
+                continue
+
             item = rxp_item.match(line)
-            
-            if openbraceline:
-                braceLevel += 1
-                resname = openbraceline.group("Name")
-                
-                if not resname in resource.directives:
-                    raise "Unknown Resource: %s" % resname
+            if item:
+                name = item.group(1)
+                value = item.group(2)
+                #print "item:",name,value
+                newRes=resource.Resource(level+1)
+                newRes.name=name
+                newRes.value=value
+                curRes.add_item(newRes)
+                continue
 
-                print resname
-                newRes = eval("resource.%s(braceLevel)" % resname)
-                print newRes
-                curRes.add_item(newRes)
-                treeindex[braceLevel]=curRes;
-                curRes = newRes
-            elif closebraceline:
-                braceLevel -= 1
-                curRes = treeindex[braceLevel]           
-            elif item:
-                name = item.group("Name")
-                value = item.group("Value")
-                curRes.add_item(directive.Item(name, value))
-    
+        #print "END",curRes.name
     
 class DirdConfig(Config):
@@ -97 +122 @@
 if __name__ == "__main__":
     
-    dirdcfg = DirdConfig("../conf/bacula-dir.conf")
+    dirdcfg = DirdConfig("test.conf")
     dirdcfg.read()
-    
+    #print dirdcfg.getResourceById(174)
+    jobs=dirdcfg.getResourceByName("Job")
+    for j in jobs:
+        print j.getByName("Name")[0].value
+    d=dirdcfg.getResourceByName("ip")[1]
+    print d
+
+    job=resource.Job(1,"Job")
+    job.add("Name",'"test2"')
+    job.add("Client",'"test2"')
+    job.add("JobDefs",'"testdefs"')
+    job.add("FileSet",'"Full Set"')
+
+    root=dirdcfg.getRoot()
+    root.add_item(job)
+
+    print root
     sys.exit(0)

vanHelsing/trunk/src/directive.py

@@ -6 +6 @@
 @author: hmueller
 '''
+
+from resource import Resource
 
 PrettyNames = {}
@@ -30 +32 @@
 #
 
-class Item(object):
+class Item(Resource):
     def __init__(self, name, default=None, type=None, required=False):
         self.name = name
@@ -50 +52 @@
         return self.name < other.name
     
-    def __str__(self):
-        if PrettyNames.has_key(self.name):
-            return '%s = "%s"' % (self.prettyName(), str(self.value))
-        else:
-            return '%s = "%s" # Warning: No pretty name' % (
-                                            self.name, str(self.value))
     def prettyName(self):
         return PrettyNames.get(self.name, self.name)

vanHelsing/trunk/src/resource.py

@@ -6 +6 @@
 '''
 
+
+
 class Resource(object):
-    DIRECTIVE=""
+    DIRECTIVE="Resource"
+    serial=0
 
-    def __init__(self, level=0):
+    def __init__(self, level=0,name=None):
+        Resource.serial=Resource.serial+1
         self.items = []
         self.comments = []
         self._recurselevel = level
-    
+        self.name = name
+        self.value = None
+        self.id=Resource.serial
+
     def __str__(self):
         s = "\n".join(self.comments) 
-        s += self.DIRECTIVE + "{\n"
+        indent="  "*self._recurselevel
+        s += indent+"# id:"+str(self.id)+"\n"
+
+        if len(self.items)==0:
+                return indent+self.name+" = "+self.value+"\n";
+
+        s += indent+self.name + " {\n"
         for d in self.items:
-            s += "  " + str(d) + "\n"
-        s += "}\n"
+            s += str(d)
+        s += indent+"}\n"
         return s
     
@@ -29 +42 @@
     def add_item(self, item):
         self.items.append(item)
+
+    def add(self,key,value):
+        newRes=Resource()
+        newRes.name=key
+        newRes.value=value
+        newRes._recurselevel=self._recurselevel+1
+        self.items.append(newRes)
+
+    def getById(self,theid):
+        if self.id==theid:
+                return self
+
+        for r in self.items:
+                result=r.getById(theid)
+                if result:
+                        return result
+        return None
+
+    def getByName(self,name):
+        result=[]
+        if self.name==name:
+                result.append(self)
+        for i in self.items:
+                r=i.getByName(name)
+                if len(r)!=0:
+                    for a in r:
+                        result.append(a)
+        return result
+                          
 
 class Director(Resource):