From 331fd5504567e8f0bdf5f7b71c539cdf6c61dd9a Mon Sep 17 00:00:00 2001
From: Halyul <i@halyul.dev>
Date: Thu, 3 Jun 2021 15:39:58 -0400
Subject: [PATCH] feat(path): update path

---
 config.yaml    |  4 ++--
 lib/builder.py | 22 ++++++++++++----------
 lib/server.py  |  4 ++--
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/config.yaml b/config.yaml
index 788f37c..13715c2 100644
--- a/config.yaml
+++ b/config.yaml
@@ -5,10 +5,10 @@ operators:
     project_json: project.json
     release_folder: ./release/{name}/
     source_folder: ./operator/{name}/extracted/
-    target_folder: ./operator/{name}/
+    target_folder: ./operator/{name}/processed/
     title: Skadi the Corrupting Heart
     use_skel: true
 server:
-  operator_folder: /operator/
+  operator_folder: ./operator/
   release_folder: ./release/
   template_folder: ./template/
diff --git a/lib/builder.py b/lib/builder.py
index ec82f8c..8da34bd 100644
--- a/lib/builder.py
+++ b/lib/builder.py
@@ -33,7 +33,7 @@ class Builder:
             skel=target_path + common_name + ".skel",
         )
 
-        operator_file = pathlib.Path.cwd().joinpath(target_path, "operator.js")
+        operator_file = pathlib.Path.cwd().joinpath(target_path, "..", "operator.js")
         if operator_file.exists() is False:
             print("Building operaotr data for {}...".format(operator_name))
 
@@ -58,7 +58,7 @@ class Builder:
                 args=(
                     file_paths["atlas"],
                     data,
-                    ".{}".format(self.config["server"]["operator_folder"]) + common_name + ".atlas",
+                    self.config["server"]["operator_folder"] + common_name + ".atlas",
                 ),
                 daemon=True,
             )
@@ -87,7 +87,7 @@ class Builder:
                     args=(
                         target_path + item,
                         data,
-                        ".{}".format(self.config["server"]["operator_folder"]) + item,
+                        self.config["server"]["operator_folder"] + item,
                     ),
                     daemon=True,
                 )
@@ -102,7 +102,7 @@ class Builder:
                     args=(
                         file_paths["skel"],
                         data,
-                        ".{}".format(self.config["server"]["operator_folder"]) + common_name + ".skel",
+                        self.config["server"]["operator_folder"] + common_name + ".skel",
                     ),
                     daemon=True,
                 )
@@ -114,7 +114,7 @@ class Builder:
                     args=(
                         file_paths["json"],
                         data,
-                        ".{}".format(self.config["server"]["operator_folder"]) + common_name + ".json",
+                        self.config["server"]["operator_folder"] + common_name + ".json",
                     ),
                     daemon=True,
                 )
@@ -175,8 +175,8 @@ class Builder:
     def __release_file(self, operator_name):
         target_path = self.config["server"]["release_folder"]
         operator_release_path = pathlib.Path.cwd().joinpath(target_path, operator_name)
-        release_operator_assets_path = pathlib.Path.cwd().joinpath(operator_release_path, ".{}".format(self.config["server"]["operator_folder"]))
-        operator_assets_path = pathlib.Path.cwd().joinpath(self.config["operators"][operator_name]["target_folder"].format(name=operator_name))
+        release_operator_assets_path = pathlib.Path.cwd().joinpath(operator_release_path, self.config["server"]["operator_folder"])
+        operator_assets_path = pathlib.Path.cwd().joinpath(self.config["operators"][operator_name]["target_folder"].format(name=operator_name), "..")
         template_path = pathlib.Path.cwd().joinpath(self.config["server"]["template_folder"])
 
         if operator_release_path.exists() is True:
@@ -200,10 +200,12 @@ class Builder:
         
         for file in template_path.iterdir():
             if file.is_file() is True:
-                filename = file.name
-                file_path = pathlib.Path.cwd().joinpath(operator_release_path, filename)
+                __temp = file.name.split(".")
+                filename = __temp[0]
+                fileext = __temp[1]
+                file_path = pathlib.Path.cwd().joinpath(operator_release_path, file.name)
 
-                if filename == "index.html":
+                if filename == "index" and fileext == "html":
                     self.html_processor.build(operator_name, file, file_path)
                 else:
                     shutil.copyfile(
diff --git a/lib/server.py b/lib/server.py
index f53bf26..70d3922 100644
--- a/lib/server.py
+++ b/lib/server.py
@@ -40,7 +40,7 @@ class httpd(SimpleHTTPRequestHandler):
             self.path = self.path.split("?")[0]
         
         split_path = self.path.split("/")
-        access_path = "/{}/".format(split_path[1])
+        access_path = "./{}/".format(split_path[1])
 
         if self.path == "/":
             # self.path = self.config["template_folder"] + "index.html"
@@ -50,7 +50,7 @@ class httpd(SimpleHTTPRequestHandler):
             html = self.html_processor.process(self.operator, self.config["template_folder"] + "index.html")
             self.wfile.write(bytes(html, "utf8"))
             return
-        elif access_path == "/assets/":
+        elif access_path == "./assets/":
             # assets folder
             self.path = self.config["template_folder"] + "assets/" + "/".join([i for i in split_path[2:]])
         elif self.config["operator_folder"] == access_path: