chizui/aklive2d
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(path): update path

Browse Source
This commit is contained in:
Halyul
2021-06-03 15:39:58 -04:00
parent c4f598b971
commit 331fd55045
3 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config.yaml
View File

@@ -5,10 +5,10 @@ operators:
project_json: project.json project_json: project.json
release_folder: ./release/{name}/ release_folder: ./release/{name}/
source_folder: ./operator/{name}/extracted/ source_folder: ./operator/{name}/extracted/
target_folder: ./operator/{name}/ target_folder: ./operator/{name}/processed/
title: Skadi the Corrupting Heart title: Skadi the Corrupting Heart
use_skel: true use_skel: true
server: server:
operator_folder: /operator/ operator_folder: ./operator/
release_folder: ./release/ release_folder: ./release/
template_folder: ./template/ template_folder: ./template/

22
lib/builder.py
View File

@@ -33,7 +33,7 @@ class Builder:
skel=target_path + common_name + ".skel", 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: if operator_file.exists() is False:
print("Building operaotr data for {}...".format(operator_name)) print("Building operaotr data for {}...".format(operator_name))
@@ -58,7 +58,7 @@ class Builder:
args=( args=(
file_paths["atlas"], file_paths["atlas"],
data, data,
".{}".format(self.config["server"]["operator_folder"]) + common_name + ".atlas", self.config["server"]["operator_folder"] + common_name + ".atlas",
), ),
daemon=True, daemon=True,
) )
@@ -87,7 +87,7 @@ class Builder:
args=( args=(
target_path + item, target_path + item,
data, data,
".{}".format(self.config["server"]["operator_folder"]) + item, self.config["server"]["operator_folder"] + item,
), ),
daemon=True, daemon=True,
) )
@@ -102,7 +102,7 @@ class Builder:
args=( args=(
file_paths["skel"], file_paths["skel"],
data, data,
".{}".format(self.config["server"]["operator_folder"]) + common_name + ".skel", self.config["server"]["operator_folder"] + common_name + ".skel",
), ),
daemon=True, daemon=True,
) )
@@ -114,7 +114,7 @@ class Builder:
args=( args=(
file_paths["json"], file_paths["json"],
data, data,
".{}".format(self.config["server"]["operator_folder"]) + common_name + ".json", self.config["server"]["operator_folder"] + common_name + ".json",
), ),
daemon=True, daemon=True,
) )
@@ -175,8 +175,8 @@ class Builder:
def __release_file(self, operator_name): def __release_file(self, operator_name):
target_path = self.config["server"]["release_folder"] target_path = self.config["server"]["release_folder"]
operator_release_path = pathlib.Path.cwd().joinpath(target_path, operator_name) 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"])) 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)) 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"]) template_path = pathlib.Path.cwd().joinpath(self.config["server"]["template_folder"])
if operator_release_path.exists() is True: if operator_release_path.exists() is True:
@@ -200,10 +200,12 @@ class Builder:
for file in template_path.iterdir(): for file in template_path.iterdir():
if file.is_file() is True: if file.is_file() is True:
filename = file.name __temp = file.name.split(".")
file_path = pathlib.Path.cwd().joinpath(operator_release_path, filename) 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) self.html_processor.build(operator_name, file, file_path)
else: else:
shutil.copyfile( shutil.copyfile(

4
lib/server.py
View File

@@ -40,7 +40,7 @@ class httpd(SimpleHTTPRequestHandler):
self.path = self.path.split("?")[0] self.path = self.path.split("?")[0]
split_path = self.path.split("/") split_path = self.path.split("/")
access_path = "/{}/".format(split_path[1]) access_path = "./{}/".format(split_path[1])
if self.path == "/": if self.path == "/":
# self.path = self.config["template_folder"] + "index.html" # 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") html = self.html_processor.process(self.operator, self.config["template_folder"] + "index.html")
self.wfile.write(bytes(html, "utf8")) self.wfile.write(bytes(html, "utf8"))
return return
elif access_path == "/assets/": elif access_path == "./assets/":
# assets folder # assets folder
self.path = self.config["template_folder"] + "assets/" + "/".join([i for i in split_path[2:]]) self.path = self.config["template_folder"] + "assets/" + "/".join([i for i in split_path[2:]])
elif self.config["operator_folder"] == access_path: elif self.config["operator_folder"] == access_path: