niklas/amduat
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Add quiet flag to amduat-asl

Browse source
This commit is contained in:
Carl Niklas Rydberg 2025-12-20 10:53:22 +01:00
parent f406e1d10a
commit 93d9f87783
1 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/tools/amduat_asl_cli.c
View file

@ -47,6 +47,7 @@ typedef struct {
const char *profile; const char *profile;
const char *hash; const char *hash;
bool force; bool force;
bool quiet;
} amduat_asl_cli_init_opts_t; } amduat_asl_cli_init_opts_t;
typedef struct { typedef struct {
@ -57,6 +58,7 @@ typedef struct {
amduat_asl_cli_ref_format_t ref_format; amduat_asl_cli_ref_format_t ref_format;
bool has_type_tag; bool has_type_tag;
amduat_type_tag_t type_tag; amduat_type_tag_t type_tag;
bool quiet;
} amduat_asl_cli_put_opts_t; } amduat_asl_cli_put_opts_t;
typedef struct { typedef struct {
@ -68,6 +70,7 @@ typedef struct {
bool has_expect_type_tag; bool has_expect_type_tag;
amduat_type_tag_t expect_type_tag; amduat_type_tag_t expect_type_tag;
bool print_type_tag; bool print_type_tag;
bool quiet;
} amduat_asl_cli_get_opts_t; } amduat_asl_cli_get_opts_t;
static void amduat_asl_cli_print_usage(FILE *stream) { static void amduat_asl_cli_print_usage(FILE *stream) {
@ -75,14 +78,16 @@ static void amduat_asl_cli_print_usage(FILE *stream) {
"usage:\n" "usage:\n"
" amduat-asl init [--root PATH] [--store-id ID]\n" " amduat-asl init [--root PATH] [--store-id ID]\n"
" [--profile PROFILE_ID|name]\n" " [--profile PROFILE_ID|name]\n"
" [--hash HASH_ID|name] [--force]\n" " [--hash HASH_ID|name] [--force] [--quiet]\n"
" amduat-asl put [--root PATH] [--type-tag TAG]\n" " amduat-asl put [--root PATH] [--type-tag TAG]\n"
" [--input PATH|-] [--input-format raw|artifact]\n" " [--input PATH|-] [--input-format raw|artifact]\n"
" [--ref-format hex|bytes] [--output PATH|-]\n" " [--ref-format hex|bytes] [--output PATH|-]\n"
" [--quiet]\n"
" amduat-asl get --ref REF [--root PATH]\n" " amduat-asl get --ref REF [--root PATH]\n"
" [--ref-format hex|bytes] [--output PATH|-]\n" " [--ref-format hex|bytes] [--output PATH|-]\n"
" [--output-format raw|artifact]\n" " [--output-format raw|artifact]\n"
" [--expect-type-tag TAG] [--print-type-tag]\n" " [--expect-type-tag TAG] [--print-type-tag]\n"
" [--quiet]\n"
"\n" "\n"
"defaults:\n" "defaults:\n"
" --root %s\n" " --root %s\n"
@ -608,6 +613,8 @@ static int amduat_asl_cli_cmd_init(int argc, char **argv) {
opts.hash = argv[++i]; opts.hash = argv[++i];
} else if (strcmp(argv[i], "--force") == 0) { } else if (strcmp(argv[i], "--force") == 0) {
opts.force = true; opts.force = true;
} else if (strcmp(argv[i], "--quiet") == 0) {
opts.quiet = true;
} else if (strcmp(argv[i], "--help") == 0 || strcmp(argv[i], "-h") == 0) { } else if (strcmp(argv[i], "--help") == 0 || strcmp(argv[i], "-h") == 0) {
amduat_asl_cli_print_usage(stdout); amduat_asl_cli_print_usage(stdout);
return AMDUAT_ASL_CLI_EXIT_OK; return AMDUAT_ASL_CLI_EXIT_OK;
@ -642,7 +649,7 @@ static int amduat_asl_cli_cmd_init(int argc, char **argv) {
ok = amduat_asl_store_fs_init_root(opts.root, &cfg_in, &cfg_out); ok = amduat_asl_store_fs_init_root(opts.root, &cfg_in, &cfg_out);
if (!ok && opts.force) { if (!ok && opts.force) {
ok = amduat_asl_store_fs_init_root(opts.root, NULL, &cfg_out); ok = amduat_asl_store_fs_init_root(opts.root, NULL, &cfg_out);
if (ok && (opts.store_id || opts.profile || opts.hash)) { if (ok && (opts.store_id || opts.profile || opts.hash) && !opts.quiet) {
fprintf(stderr, fprintf(stderr,
"warning: existing config kept; overrides ignored\n"); "warning: existing config kept; overrides ignored\n");
} }
@ -653,8 +660,10 @@ static int amduat_asl_cli_cmd_init(int argc, char **argv) {
return AMDUAT_ASL_CLI_EXIT_CONFIG; return AMDUAT_ASL_CLI_EXIT_CONFIG;
} }
if (!opts.quiet) {
fprintf(stderr, "root=%s\n", opts.root); fprintf(stderr, "root=%s\n", opts.root);
amduat_asl_cli_print_store_meta(&cfg_out); amduat_asl_cli_print_store_meta(&cfg_out);
}
return AMDUAT_ASL_CLI_EXIT_OK; return AMDUAT_ASL_CLI_EXIT_OK;
} }
@ -726,6 +735,8 @@ static int amduat_asl_cli_cmd_put(int argc, char **argv) {
return AMDUAT_ASL_CLI_EXIT_USAGE; return AMDUAT_ASL_CLI_EXIT_USAGE;
} }
opts.output_path = argv[++i]; opts.output_path = argv[++i];
} else if (strcmp(argv[i], "--quiet") == 0) {
opts.quiet = true;
} else if (strcmp(argv[i], "--help") == 0 || strcmp(argv[i], "-h") == 0) { } else if (strcmp(argv[i], "--help") == 0 || strcmp(argv[i], "-h") == 0) {
amduat_asl_cli_print_usage(stdout); amduat_asl_cli_print_usage(stdout);
return AMDUAT_ASL_CLI_EXIT_OK; return AMDUAT_ASL_CLI_EXIT_OK;
@ -814,7 +825,7 @@ static int amduat_asl_cli_cmd_put(int argc, char **argv) {
} }
} }
if (exit_code == AMDUAT_ASL_CLI_EXIT_OK) { if (exit_code == AMDUAT_ASL_CLI_EXIT_OK && !opts.quiet) {
char *hex_ref = NULL; char *hex_ref = NULL;
fprintf(stderr, "root=%s\n", opts.root); fprintf(stderr, "root=%s\n", opts.root);
amduat_asl_cli_print_store_meta(&cfg); amduat_asl_cli_print_store_meta(&cfg);
@ -910,6 +921,8 @@ static int amduat_asl_cli_cmd_get(int argc, char **argv) {
opts.has_expect_type_tag = true; opts.has_expect_type_tag = true;
} else if (strcmp(argv[i], "--print-type-tag") == 0) { } else if (strcmp(argv[i], "--print-type-tag") == 0) {
opts.print_type_tag = true; opts.print_type_tag = true;
} else if (strcmp(argv[i], "--quiet") == 0) {
opts.quiet = true;
} else if (strcmp(argv[i], "--help") == 0 || strcmp(argv[i], "-h") == 0) { } else if (strcmp(argv[i], "--help") == 0 || strcmp(argv[i], "-h") == 0) {
amduat_asl_cli_print_usage(stdout); amduat_asl_cli_print_usage(stdout);
return AMDUAT_ASL_CLI_EXIT_OK; return AMDUAT_ASL_CLI_EXIT_OK;
@ -999,7 +1012,7 @@ static int amduat_asl_cli_cmd_get(int argc, char **argv) {
} }
} }
if (exit_code == AMDUAT_ASL_CLI_EXIT_OK) { if (exit_code == AMDUAT_ASL_CLI_EXIT_OK && !opts.quiet) {
fprintf(stderr, "root=%s\n", opts.root); fprintf(stderr, "root=%s\n", opts.root);
amduat_asl_cli_print_store_meta(&cfg); amduat_asl_cli_print_store_meta(&cfg);
fprintf(stderr, "bytes=%zu\n", artifact.bytes.len); fprintf(stderr, "bytes=%zu\n", artifact.bytes.len);