From ec1eb17691901f8732f4825c3fb05e5e133a2104 Mon Sep 17 00:00:00 2001 From: Haoyu Xu Date: Tue, 3 Aug 2021 02:50:46 -0400 Subject: [PATCH] feat(server): add rebuild option for server --- aklive2d.py | 13 +++++++++---- lib/server.py | 5 +++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/aklive2d.py b/aklive2d.py index f541cb2..561344a 100755 --- a/aklive2d.py +++ b/aklive2d.py @@ -49,6 +49,13 @@ class AkLive2D: required=True, help=" Operatro to develop", ) + server.add_argument( + "-r", + "--rebuild", + dest="rebuild", + action='store_true', + help="Rebuild assets" + ) build = subprasers.add_parser( "build", @@ -65,7 +72,6 @@ class AkLive2D: nargs='+', help="Operators to build" ) - build.add_argument( "-r", "--rebuild", @@ -76,9 +82,8 @@ class AkLive2D: self.args = parser.parse_args() if self.args.command == "server" or self.args.command == "s": - self.running = Server(self.args.port, self.args.operator_name, self.config) - - if self.args.command == "build" or self.args.command == "b": + self.running = Server(self.args.port, self.args.operator_name, self.config, self.args.rebuild) + elif self.args.command == "build" or self.args.command == "b": self.running = Builder(self.config, self.args.operator_names, self.args.rebuild) self.running.start() diff --git a/lib/server.py b/lib/server.py index 70d3922..f0737c8 100644 --- a/lib/server.py +++ b/lib/server.py @@ -6,15 +6,16 @@ from lib.builder import Builder from lib.html_processor import HtmlProcessor class Server: - def __init__(self, port, operator, config) -> None: + def __init__(self, port, operator, config, rebuild) -> None: self.config = config self.operator = operator self.port = port + self.rebuild = rebuild self.httpd = TCPServer(("", port), httpd(operator, config, directory=str(pathlib.Path.cwd()))) def start(self): # build assets first - Builder(self.config).build_assets(self.operator) + Builder(self.config, rebuild=self.rebuild).build_assets(self.operator) print("Server is up at 0.0.0.0:{port}".format(port=self.port)) self.httpd.serve_forever() return