Changeset 1f6a573 for fedd/federation/access.py

Timestamp:

Nov 30, 2010 4:45:00 PM (13 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master

Children:

4692a16

Parents:

c002cb2

Message:

Support for priorities and export projects

File:

• fedd/federation/access.py (modified) (4 diffs)

fedd/federation/access.py

@@ -53 +53 @@
             self.value = value
             self.priority = pri
+        def __str__(self):
+            return "%s: %s (%d)" % (self.attr, self.value, self.priority)
 
     def __init__(self, config=None, auth=None):
@@ -140 +142 @@
         """
 
-        map_re = re.compile("(\S+)\s+->\s+(.*)");
+        map_re = re.compile("(\S+)\s+->\s+(.*)")
+        priority_re = re.compile("([^,]+),\s*(\d+)")
+
         if access_obj is None:
             access_obj = lambda(x): "%s" % x
 
         self.access = []
+        priorities = { }
 
         f = open(fn, 'r')
@@ -160 +165 @@
                     continue
 
+                # If a priority is found, collect them
+                m = priority_re.match(line)
+                if m:
+                    try:
+                        priorities[m.group(1)] = int(m.group(2))
+                    except ValueError, e:
+                        if self.log:
+                            self.log.debug("Bad priority in %s line %d" % \
+                                    (fn, lineno))
+                    continue
+
                 # Nothing matched to here: unknown line - raise exception
                 # (finally will close f)
@@ -167 +183 @@
         finally:
             if f: f.close()
+
+        # Set priorities
+        for a in self.access:
+            if a.attr in priorities:
+                a.priority = priorities[a.attr]
 
     def write_state(self):