Slight re-organization in engine.py

Author: arjun-menon

alteza/__main__.py

@@ -1,12 +1,12 @@
-#!/usr/bin/env python3
-from .engine import run, Args
-
-
-def main() -> None:
-    run(Args().parse_args())
-
-
-# See: https://chriswarrick.com/blog/2014/09/15/python-apps-the-right-way-entry_points-and-scripts/
-
-if __name__ == "__main__":
-    main()
+#!/usr/bin/env python3
+from .engine import Engine, Args
+
+
+def main() -> None:
+    Engine.run(Args().parse_args())
+
+
+# See: https://chriswarrick.com/blog/2014/09/15/python-apps-the-right-way-entry_points-and-scripts/
+
+if __name__ == "__main__":
+    main()

alteza/engine.py

@@ -363,26 +363,6 @@ def linkStaticAsset(fileNode: FileNode, shouldCopy: bool) -> None:
         else:
             os.symlink(fileNode.absoluteFilePath, fileNode.fileName)
 
-    @staticmethod
-    def resetOutputDir(outputDir: str, shouldDelete: bool) -> None:
-        if os.path.isfile(outputDir):
-            raise AltezaException(
-                f"A file named {outputDir} already exists. Please move it or delete it. "
-                "Note that if this had been a directory, we would have erased it."
-            )
-        if os.path.isdir(outputDir):
-            if not shouldDelete:
-                raise AltezaException(
-                    f"Specified output directory {outputDir} already exists.\n"
-                    "Please use --clear_output_dir to delete it prior to site generation."
-                )
-            print(
-                f"Deleting directory {Fore.dark_red_2}%s{Style.reset} and all of its content...\n"
-                % outputDir
-            )
-            shutil.rmtree(outputDir)
-        os.mkdir(outputDir)
-
     @staticmethod
     def generate(args: Args, content: Content) -> None:
         def walk(curDir: DirNode) -> None:
@@ -412,30 +392,61 @@ def enterDir(newDir: str) -> Generator[None, None, None]:
         os.chdir(oldDir)
 
 
-def run(args: Args) -> None:
-    startTimeNs = time.time_ns()
-    contentDir = args.content
-    if not os.path.isdir(contentDir):
-        raise AltezaException(
-            f"The provided path '{contentDir}' does not exist or is not a directory."
-        )
+class Engine:
+    @staticmethod
+    def checkContentDir(contentDir: str) -> None:
+        if not os.path.isdir(contentDir):
+            raise AltezaException(
+                f"The provided path '{contentDir}' does not exist or is not a directory."
+            )
 
-    Generate.resetOutputDir(args.output, args.clear_output_dir)
+    @staticmethod
+    def resetOutputDir(outputDir: str, shouldDelete: bool) -> None:
+        if os.path.isfile(outputDir):
+            raise AltezaException(
+                f"A file named {outputDir} already exists. Please move it or delete it. "
+                "Note that if this had been a directory, we would have erased it."
+            )
+        if os.path.isdir(outputDir):
+            if not shouldDelete:
+                raise AltezaException(
+                    f"Specified output directory {outputDir} already exists.\n"
+                    "Please use --clear_output_dir to delete it prior to site generation."
+                )
+            print(
+                f"Deleting directory {Fore.dark_red_2}%s{Style.reset} and all of its content...\n"
+                % outputDir
+            )
+            shutil.rmtree(outputDir)
+        os.mkdir(outputDir)
+
+    @staticmethod
+    def process(args: Args) -> Content:
+        with enterDir(args.content):
+            print("Analyzing content directory...")
+            fs = Fs()
+            print(fs.nameRegistry)
+            content = Content(args, fs)
+            print("Processing...\n")
+            content.process()
+            print("\nSuccessfully completed processing.\n")
 
-    with enterDir(args.content):
-        fs = Fs()
-        print(fs.nameRegistry)
-        content = Content(args, fs)
-        print("Processing...\n")
-        content.process()
-        print("\nSuccessfully completed processing.\n")
+        print("File Tree:")
+        print(fs.rootDir.displayDir())
+
+        return content
+
+    @staticmethod
+    def run(args: Args) -> None:
+        startTimeNs = time.time_ns()
 
-    print("File Tree:")
-    print(fs.rootDir.displayDir())
+        Engine.checkContentDir(args.content)
+        Engine.resetOutputDir(args.output, args.clear_output_dir)
 
-    print("Generating...")
-    Generate.generate(args, content)
+        content = Engine.process(args)
+        print("Generating...")
+        Generate.generate(args, content)
 
-    elapsedMilliseconds = (time.time_ns() - startTimeNs) / 10**6
-    # pylint: disable=consider-using-f-string
-    print("\nTime elapsed: %.2f ms" % elapsedMilliseconds)
+        elapsedMilliseconds = (time.time_ns() - startTimeNs) / 10**6
+        # pylint: disable=consider-using-f-string
+        print("\nTime elapsed: %.2f ms" % elapsedMilliseconds)