add --outdir argument, remove directory params from builder

This commit is contained in:
Emi Vasilek 2023-11-21 01:39:42 +01:00
parent 7fb3a1c0e9
commit 98c77cb102
2 changed files with 37 additions and 33 deletions

View file

@ -13,11 +13,13 @@ def main() -> None:
parser_build = subparsers.add_parser("build")
parser_build.add_argument("directory", type=str)
parser_build.add_argument("--outdir", type=str, default="out")
parser_serve = subparsers.add_parser("serve")
parser_serve.add_argument("directory", type=str)
parser_serve.add_argument("--port", type=int, default=8000)
parser_serve.add_argument("--address", type=str, default="127.0.0.1")
parser_serve.add_argument("--outdir", type=str, default="out/html")
parser_generate_units = subparsers.add_parser("generate-units")
parser_generate_units.add_argument("directory", type=str)
@ -32,9 +34,10 @@ def main() -> None:
ret = 0
builder = comfyrecipes.builder.Builder()
if args.subcommand == "build":
ret = builder.build(args.directory)
ret = builder.build(args.directory, args.outdir)
elif args.subcommand == "serve":
os.chdir(f"{args.directory}/out/html")
os.chdir(args.directory)
os.chdir(args.outdir)
httpd = socketserver.TCPServer(
(args.address, args.port), http.server.SimpleHTTPRequestHandler
)
@ -48,13 +51,13 @@ def main() -> None:
print("units.yaml already exists, pass --force if you want to overwrite it", file=sys.stderr)
ret = 1
else:
builder.generate_units(args.directory)
builder.generate_units()
elif args.subcommand == "generate-ingredients":
if not args.force and os.path.isfile(args.directory + "/ingredients.yaml"):
print("ingredients.yaml already exists, pass --force if you want to overwrite it", file=sys.stderr)
ret = 1
else:
builder.generate_ingredients(args.directory)
builder.generate_ingredients()
else:
# unhandled, but valid subcommand
assert False