From 522e11c8086b7d8ab76b9be07c1861f35ed2327f Mon Sep 17 00:00:00 2001 From: Paul Oliver Date: Mon, 4 May 2026 23:33:08 +0200 Subject: Adds prototype for the data client UI --- salis.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'salis.py') diff --git a/salis.py b/salis.py index 2800d73..f8f6ce0 100755 --- a/salis.py +++ b/salis.py @@ -334,11 +334,8 @@ def pop_ui_vars(): ns.b.links.update({*ns.ui_vars["links"]}) def pop_data_push_vars(): - ns.sim_db = os.path.join(ns.sim_dir, f"{args.name}.sqlite3") - if args.data_push_pow: - ns.b.defines.add("-DDATA_PUSH") - ns.b.defines.add(f"-DDATA_PUSH_INTERVAL={2 ** args.data_push_pow}ul") + ns.sim_db = os.path.join(ns.sim_dir, f"{args.name}.sqlite3") ns.b.defines.add(f"-DDATA_PUSH_PATH=\"{ns.sim_db}\"") ns.b.links.add("-lsqlite3") ns.b.links.add("-lz") @@ -347,7 +344,6 @@ def pop_data_push_vars(): log.warn("Data aggregation disabled") if not args.no_compress: - ns.b.defines.add("-DCOMPRESS") ns.b.links.add("-lz") log.info("Save file compression enabled") else: @@ -359,6 +355,7 @@ def pop_sim_path_vars(): def pop_net_vars(): ns.b.defines.add(f"-DPORT={args.port}") + ns.b.defines.add(f"-DPORT_STR=\"{args.port}\"") ns.b.defines.add(f"-DREQUEST_NAME='{Request.REQUEST_NAME.value}'") ns.b.defines.add(f"-DREQUEST_OPTS='{Request.REQUEST_OPTS.value}'") ns.b.defines.add(f"-DREQUEST_HASH='{Request.REQUEST_HASH.value}'") @@ -368,6 +365,13 @@ def pop_general(): ns.b.flags.add(f"-Iarch/{args.arch}") ns.b.flags.add("-Icore") + if args.data_push_pow: + ns.b.defines.add("-DDATA_PUSH") + ns.b.defines.add(f"-DDATA_PUSH_INTERVAL={2 ** args.data_push_pow}ul") + + if not args.no_compress: + ns.b.defines.add("-DCOMPRESS") + if args.muta_flip: ns.b.defines.add("-DMUTA_FLIP") @@ -430,7 +434,7 @@ if args.command == "client": ns.b = Build("data/client.c", log) pop_net_vars() pop_general() - ns.b.defines.add(f"-DIP={args.ip}") + ns.b.defines.add(f"-DIP=\"{args.ip}\"") ns.b.defines.add("-DNCURSES_WIDECHAR=1") ns.b.links.add("-lcurses") -- cgit v1.3