X-Git-Url: https://git.ralfj.de/zonemaker.git/blobdiff_plain/cfd2f5fc1e06dc0fa0894d2b49405cb424d335ff..f036ee7868886116f0aab76a4cf80dae72b4cd19:/zone.py

diff --git a/zone.py b/zone.py
index b0d055e..5cd0d72 100644
--- a/zone.py
+++ b/zone.py
@@ -101,6 +101,15 @@ def column_widths(datas: 'Sequence', widths: 'Sequence[int]'):
     # last data point
     return result+str(datas[-1])
 
+def concatenate(root, path):
+    if path == '' or root == '':
+        raise Exception("Empty domain name is not valid")
+    if path == '@':
+        return root
+    if root == '@' or path.endswith('.'):
+        return path
+    return path+"."+root
+
 
 ## Enums
 class Protocol:
@@ -131,15 +140,7 @@ class RR:
         return self
     
     def relativize(self, root):
-        def _relativize(path):
-            if path == '' or root == '':
-                raise Exception("Empty domain name is not valid")
-            if path == '@':
-                return root
-            if root == '@' or path.endswith('.'):
-                return path
-            return path+"."+root
-        return self.mapPath(_relativize)
+        return self.mapPath(lambda path: concatenate(root, path))
     
     def mapTTL(self, f):
         '''Run the current TTL and the recordType through f.'''
@@ -147,7 +148,7 @@ class RR:
         return self
     
     def __str__(self):
-        return column_widths((self.path, time(self.TTL), self.recordType, self.data), (32, 8, 8))
+        return column_widths((self.path, time(self.TTL), self.recordType, self.data), (8*3, 8, 8))
 
 ## Record types
 class A:
@@ -346,6 +347,20 @@ class Zone:
         # be done
         return cur_serial
     
+    @staticmethod
+    def generate_rrs_from_dict(root, domains):
+        for name in sorted(domains.keys(), key=lambda s: s.split('.')):
+            if name.endswith('.'):
+                raise Exception("You are trying to add a record outside of your zone. This is not supported. Use '@' for the zone root.")
+            domain = domains[name]
+            name = concatenate(root, name)
+            if isinstance(domain, dict):
+                for rr in Zone.generate_rrs_from_dict(name, domain):
+                    yield rr
+            else:
+                for rr in domain.generate_rrs():
+                    yield rr.relativize(name)
+    
     def generate_rrs(self) -> 'Iterator':
         # SOA record
         serial = self.inc_serial()
@@ -360,14 +375,11 @@ class Zone:
         for name in self._NS:
             yield NS(name).generate_rr()
         # all the rest
-        for name in sorted(self._domains.keys(), key=lambda s: list(reversed(s.split('.')))):
-            if name.endswith('.'):
-                raise Exception("You are trying to add a record outside of your zone. This is not supported. Use '@' for the zone root.")
-            for rr in self._domains[name].generate_rrs():
-                yield rr.relativize(name)
+        for rr in Zone.generate_rrs_from_dict('@', self._domains):
+            yield rr
     
     def write(self) -> None:
         print(";; {} zone file, generated by zonemaker <https://www.ralfj.de/projects/zonemaker> on {}".format(self._name, datetime.datetime.now()))
         print("$ORIGIN {}".format(self._name))
-        for rr in map(lambda rr: rr.relativize(self._name).mapTTL(self.getTTL), self.generate_rrs()):
+        for rr in map(lambda rr: rr.mapTTL(self.getTTL), self.generate_rrs()):
             print(rr)