tools: Move filename generation into RIR class

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/tools/base.py b/tools/base.py
index 125fd4017a83c2ec7b052936fddb3dcab5e9268d..b4d3c38bc328edb7fca560f4dd3924a4c0063cf9 100644 (file)
--- a/tools/base.py
+++ b/tools/base.py
@@ -30,6 +30,9 @@ import sqlite3
 
 from . import downloader
 
+FILENAME_ASNUMS   = "asnums.txt"
+FILENMAE_NETWORKS = "networks.txt"
+
 FMT = "%-16s%s\n"
 
 RE_AS = re.compile(r"^(AS|as)(\d+)")
@@ -57,6 +60,17 @@ class RIR(object):
        def parser(self):
                return RIRParser
 
+       def make_path(self, path):
+               return os.path.join(self.__class__.__name__, path)
+
+       @property
+       def filename_asnums(self):
+               return self.make_path(FILENAME_ASNUMS)
+
+       @property
+       def filename_networks(self):
+               return self.make_path(FILENMAE_NETWORKS)
+
        def update(self, directory):
                p = self.parser(self)
 
@@ -101,13 +115,11 @@ class RIRParser(object):
 
        def export_database(self, directory):
                # Write all ASes
-               fn_asnums = os.path.join(directory, "asnums.txt")
-               with open(fn_asnums, "w") as f:
+               with open(self.rir.filename_asnums, "w") as f:
                        self._export_asnums(f)
 
                # Write all networks
-               fn_networks = os.path.join(directory, "networks.txt")
-               with open(fn_networks, "w") as f:
+               with open(self.rir.filename_networks, "w") as f:
                        self._export_networks(f)
 
        def _export_asnums(self, f):