summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkj_sh6042026-02-13 23:15:17 -0500
committerkj_sh6042026-02-13 23:15:17 -0500
commit58aea46fa3b892bf12ee16ccb505099ac578fd82 (patch)
treeefcb6f16ea8587192313e21638b8f50b9c24c771
parentbd1e20b26c0f1ff7c1fd6f3b9bc34e32b5e067c9 (diff)
refactor: use PATH kjandoc
-rw-r--r--demoware/server.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/demoware/server.py b/demoware/server.py
index a4b1029..949edb8 100644
--- a/demoware/server.py
+++ b/demoware/server.py
@@ -24,7 +24,6 @@ PORT = int(sys.argv[1]) if len(sys.argv) > 1 else 8080
24BASE_DIR = Path(__file__).parent.resolve() 24BASE_DIR = Path(__file__).parent.resolve()
25UPLOAD_DIR = BASE_DIR / 'uploads' 25UPLOAD_DIR = BASE_DIR / 'uploads'
26OUTPUT_DIR = BASE_DIR / 'output' 26OUTPUT_DIR = BASE_DIR / 'output'
27KJANDOC = (BASE_DIR.parent / 'src' / 'kjandoc').resolve()
28 27
29UPLOAD_DIR.mkdir(exist_ok=True) 28UPLOAD_DIR.mkdir(exist_ok=True)
30OUTPUT_DIR.mkdir(exist_ok=True) 29OUTPUT_DIR.mkdir(exist_ok=True)
@@ -133,7 +132,7 @@ class Handler(SimpleHTTPRequestHandler):
133 132
134 # build the real command 133 # build the real command
135 inputs = [str(job_dir / f) for f in files] 134 inputs = [str(job_dir / f) for f in files]
136 cmd = [sys.executable, str(KJANDOC)] + inputs + ['-o', str(out_path)] 135 cmd = ['kjandoc'] + inputs + ['-o', str(out_path)]
137 136
138 # pretty command for display (strip numeric id prefixes like "3_") 137 # pretty command for display (strip numeric id prefixes like "3_")
139 pretty_names = [] 138 pretty_names = []
@@ -189,15 +188,16 @@ class Handler(SimpleHTTPRequestHandler):
189 188
190 189
191def main(): 190def main():
192 if not KJANDOC.exists(): 191 kjandoc_path = shutil.which('kjandoc')
193 print(f"[!] kjandoc not found: {KJANDOC}", file=sys.stderr) 192 if not kjandoc_path:
194 print(f" expected at ../src/kjandoc relative to this script", file=sys.stderr) 193 print(f"[!] kjandoc not found in PATH", file=sys.stderr)
194 print(f" install kjandoc or ensure it's available in your PATH", file=sys.stderr)
195 sys.exit(1) 195 sys.exit(1)
196 196
197 srv = ThreadedServer(('', PORT), Handler) 197 srv = ThreadedServer(('', PORT), Handler)
198 print(f"[*] kjandoc demoware") 198 print(f"[*] kjandoc demoware")
199 print(f"[*] http://localhost:{PORT}") 199 print(f"[*] http://localhost:{PORT}")
200 print(f"[*] kjandoc: {KJANDOC}") 200 print(f"[*] kjandoc: {kjandoc_path}")
201 print(f"[*] ctrl-c to stop") 201 print(f"[*] ctrl-c to stop")
202 try: 202 try:
203 srv.serve_forever() 203 srv.serve_forever()