[PATCH v2 10/11] cli: add compact --verbose option and silence output without it
Jani Nikula
jani at nikula.org
Sun Nov 3 04:24:50 PST 2013
If there's nothing surprising to say, don't say anything. Unless asked
for by the user.
---
notmuch-compact.c | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/notmuch-compact.c b/notmuch-compact.c
index 359acfc..1e7808c 100644
--- a/notmuch-compact.c
+++ b/notmuch-compact.c
@@ -32,27 +32,33 @@ notmuch_compact_command (notmuch_config_t *config, int argc, char *argv[])
const char *path = notmuch_config_get_database_path (config);
const char *backup_path = NULL;
notmuch_status_t ret;
+ notmuch_bool_t verbose;
int opt_index;
notmuch_opt_desc_t options[] = {
{ NOTMUCH_OPT_STRING, &backup_path, "backup", 0, 0 },
+ { NOTMUCH_OPT_BOOLEAN, &verbose, "verbose", 'v', 0 },
};
opt_index = parse_arguments (argc, argv, options, 1);
if (opt_index < 0)
return 1;
- printf ("Compacting database...\n");
- ret = notmuch_database_compact (path, backup_path, status_update_cb, NULL);
+ if (verbose)
+ printf ("Compacting database...\n");
+ ret = notmuch_database_compact (path, backup_path,
+ verbose ? status_update_cb : NULL, NULL);
if (ret) {
fprintf (stderr, "Compaction failed: %s\n", notmuch_status_to_string(ret));
return 1;
}
- if (backup_path)
- printf ("The old database has been moved to %s.\n", backup_path);
+ if (verbose) {
+ if (backup_path)
+ printf ("The old database has been moved to %s.\n", backup_path);
- printf ("Done.\n");
+ printf ("Done.\n");
+ }
return 0;
}
--
1.8.4.rc3
More information about the notmuch
mailing list