From d9bc5c85288526e1e063e14fa00517e8f953be16 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Tue, 9 Feb 2021 20:26:40 -0400 Subject: [PATCH] CLI: load merged config at top level This paves the way for the conversion of the remaining subcommands to the new configuration framework. --- notmuch-client.h | 1 + notmuch.c | 29 ++++++++++++++++++++++++++--- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/notmuch-client.h b/notmuch-client.h index 70458629..b560e3ed 100644 --- a/notmuch-client.h +++ b/notmuch-client.h @@ -272,6 +272,7 @@ typedef enum { NOTMUCH_COMMAND_DATABASE_EARLY = 1 << 2, NOTMUCH_COMMAND_DATABASE_WRITE = 1 << 3, NOTMUCH_COMMAND_DATABASE_CREATE = 1 << 4, + NOTMUCH_COMMAND_CONFIG_LOAD = 1 << 5, } notmuch_command_mode_t; notmuch_config_t * diff --git a/notmuch.c b/notmuch.c index f2bf9c24..742544c2 100644 --- a/notmuch.c +++ b/notmuch.c @@ -175,7 +175,7 @@ static command_t commands[] = { { "reindex", notmuch_reindex_command, NOTMUCH_COMMAND_DATABASE_EARLY | NOTMUCH_COMMAND_DATABASE_WRITE, "Re-index all messages matching the search terms." }, - { "config", notmuch_config_command, NOTMUCH_COMMAND_CONFIG_OPEN, + { "config", notmuch_config_command, NOTMUCH_COMMAND_CONFIG_OPEN | NOTMUCH_COMMAND_CONFIG_LOAD, "Get or set settings in the notmuch configuration file." }, #if WITH_EMACS { "emacs-mua", NULL, 0, @@ -471,7 +471,7 @@ main (int argc, char *argv[]) notmuch_config_t *config = NULL; notmuch_database_t *notmuch = NULL; int opt_index; - int ret; + int ret = EXIT_SUCCESS; notmuch_opt_desc_t options[] = { { .opt_string = &config_file_name, .name = "config" }, @@ -559,7 +559,30 @@ main (int argc, char *argv[]) return EXIT_FAILURE; } } - } else { + } + + if (command->mode & NOTMUCH_COMMAND_CONFIG_LOAD) { + char *status_string = NULL; + notmuch_status_t status; + status = notmuch_database_load_config (NULL, + config_file_name, + NULL, + ¬much, + &status_string); + if (status) { + if (status_string) { + fputs (status_string, stderr); + free (status_string); + } + + if (status == NOTMUCH_STATUS_NO_CONFIG) + fputs ("Try running 'notmuch setup' to create a configuration.", stderr); + goto DONE; + } + + } + + if (command->mode & NOTMUCH_COMMAND_CONFIG_OPEN) { config = notmuch_config_open (local, config_file_name, command->mode); if (! config) { ret = EXIT_FAILURE; -- 2.43.0