mutualising code

Author: SuperFola

arkdoc/generator/base.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python3
 
+import shutil
 import os
 from typing import List
 from pathlib import Path
@@ -11,12 +12,15 @@
 
 
 class Generator:
-    def __init__(self, parsers: List[Parser], template_folder: Path, pattern: str):
+    def __init__(self, parsers: List[Parser], template_folder: Path, pattern: str, output: str, ark_version: str):
         self.template_folder = template_folder
         self.templates = {
             file.name: file.read_text("utf-8")
             for file in template_folder.glob(pattern)
         }
+        self.version = ark_version
+        self.output_path = Path(output)
+        self.output_path_ver = self.output_path / self.version
         self.list = spec.FileList([])
         self._create_files_list(parsers)
 
@@ -44,6 +48,12 @@ def generate_one(self, path: str, functions: List[spec.Function]):
         raise NotImplementedError
 
     def __call__(self):
+        if not self.output_path_ver.exists():
+            self.output_path_ver.mkdir(parents=True)
+        else:
+            shutil.rmtree(str(self.output_path_ver))
+            return self.__call__()
+
         self.generate_index()
 
         for file in self.list.files:

arkdoc/generator/html.py

@@ -1,8 +1,7 @@
 #!/usr/bin/env python3
 
-import re
-from datetime import datetime
 import shutil
+from datetime import datetime
 from typing import List
 from pprint import pformat
 from pathlib import Path
@@ -92,25 +91,16 @@ def h4(name: str) -> str:
 
 class HTMLGenerator(Generator):
     def __init__(self, parsers: List[Parser], output: str, ark_version: str):
-        super().__init__(parsers, spec.HTML_TEMPLATE_FOLDER, "*.html")
-
-        self.version = ark_version
-        self.output_path = Path(output)
-        self.output_path_ver = self.output_path / self.version
+        super().__init__(parsers, spec.HTML_TEMPLATE_FOLDER, "*.html", output, ark_version)
 
         self.footer = f"<i>Last generation at {datetime.now()}</i>"
 
     def create_dir(self, name: str):
         (self.output_path / name).mkdir()
 
     def generate_index(self):
-        if not self.output_path_ver.exists():
-            if not (self.template_folder / "assets").exists():
-                shutil.copytree(str(self.template_folder / "assets"), str(self.output_path / "assets"))
-            self.output_path_ver.mkdir()
-        else:
-            shutil.rmtree(str(self.output_path_ver))
-            return self.generate_index()
+        if not (self.output_path / "assets").exists():
+            shutil.copytree(str(self.template_folder / "assets"), str(self.output_path / "assets"))
 
         sections = html.section(
             f"ArkScript {self.version} documentation",