From ffd9f29b7a72a40ef01f83a388b3397fedb759e6 Mon Sep 17 00:00:00 2001
From: Daniel <d.brummerloh@gmail.com>
Date: Fri, 24 Nov 2023 10:35:42 +0100
Subject: [PATCH] change interface or dirmanager

---
 src/dirmanager.py                       | 37 ++++++++++++++-----------
 src/tests_authentik/runner_authentik.py |  2 +-
 2 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/src/dirmanager.py b/src/dirmanager.py
index 9d10940..8b8c16b 100644
--- a/src/dirmanager.py
+++ b/src/dirmanager.py
@@ -18,27 +18,32 @@ class DirManager:
 
     def __init__(self, tests_dir: Path, session_id: str):
         # root test dir
-        self.tests_dir = tests_dir.resolve()
+        self._tests_dir = tests_dir.resolve()
         self.session_id = session_id
 
-        self.dirs = self._get_all_dirs()
-
     def create_all_dirs(self):
-        self.create_dirs(self.tests_dir, exist_ok=True)
-        self.create_dirs(self.dirs)
+        self.create_dirs(self._tests_dir, exist_ok=True)
+        self.create_dirs([self.SESSION, self.RECORDS, self.STATES, self.RESULTS])
 
-    def _get_all_dirs(self):
-        dirs = {}
-        dirs["session"] = self.tests_dir / f"test-{self.session_id}"
-        dirs.update(self._get_subdirs(session_dir=dirs["session"]))
-        return dirs
+    @property
+    def TESTS(self):
+        return self._tests_dir
 
-    def _get_subdirs(self, session_dir: Path):
-        return {
-            "records": session_dir / Path("records"),
-            "states": session_dir / Path("states"),
-            "results": session_dir / Path("results"),
-        }
+    @property
+    def SESSION(self):
+        return self._tests_dir / f"test-{self.session_id}"
+
+    @property
+    def RECORDS(self):
+        return self.SESSION / Path("records")
+
+    @property
+    def STATES(self):
+        return self.SESSION / Path("states")
+
+    @property
+    def RESULTS(self):
+        return self.SESSION / Path("results")
 
     @staticmethod
     def create_dirs(dirs: Path | list[Path] | dict[str, Path], exist_ok=False):
diff --git a/src/tests_authentik/runner_authentik.py b/src/tests_authentik/runner_authentik.py
index 13292b3..efd82fe 100644
--- a/src/tests_authentik/runner_authentik.py
+++ b/src/tests_authentik/runner_authentik.py
@@ -18,4 +18,4 @@ class RunnerAuthentik(Runner):
 
     def run_setup(self):
         # run setup
-        setup_authentik(self.config, self.dir_manager.dirs["states"])
+        setup_authentik(self.config, self.dir_manager.STATES)