From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id QLnyBLw8MWBsaAAA0tVLHw (envelope-from ) for ; Sat, 20 Feb 2021 16:45:48 +0000 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id ALayALw8MWD9aQAAB5/wlQ (envelope-from ) for ; Sat, 20 Feb 2021 16:45:48 +0000 Received: from mail.notmuchmail.org (nmbug.tethera.net [144.217.243.247]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 312C827937 for ; Sat, 20 Feb 2021 17:45:47 +0100 (CET) Received: from nmbug.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id 4D4A226BBE; Sat, 20 Feb 2021 11:45:10 -0500 (EST) Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) by mail.notmuchmail.org (Postfix) with ESMTP id A91F626ACB for ; Sat, 20 Feb 2021 11:45:00 -0500 (EST) Received: by fethera.tethera.net (Postfix, from userid 1001) id 2B79560666; Sat, 20 Feb 2021 11:45:00 -0500 (EST) Received: (nullmailer pid 3956182 invoked by uid 1000); Sat, 20 Feb 2021 16:44:54 -0000 From: David Bremner To: notmuch@notmuchmail.org Cc: David Bremner Subject: [PATCH 10/18] CLI/config: WIP: load merged config Date: Sat, 20 Feb 2021 12:44:40 -0400 Message-Id: <20210220164448.3956011-11-david@tethera.net> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210220164448.3956011-1-david@tethera.net> References: <20210220164448.3956011-1-david@tethera.net> MIME-Version: 1.0 Message-ID-Hash: QJUHDIALRLTP5YQQSY6PFZ7K3WNE23Q5 X-Message-ID-Hash: QJUHDIALRLTP5YQQSY6PFZ7K3WNE23Q5 X-MailFrom: bremner@tethera.net X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-notmuch.notmuchmail.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.1 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: 0.48 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 144.217.243.247 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Queue-Id: 312C827937 X-Spam-Score: 0.48 X-Migadu-Scanner: scn0.migadu.com X-TUID: cNJtI6V7vHOQ --- notmuch-client.h | 1 + notmuch.c | 29 ++++++++++++++++++++++++++--- test/T030-config.sh | 11 +++++++---- test/T590-libconfig.sh | 3 --- 4 files changed, 34 insertions(+), 10 deletions(-) diff --git a/notmuch-client.h b/notmuch-client.h index f60f5406..db88daf8 100644 --- a/notmuch-client.h +++ b/notmuch-client.h @@ -258,6 +258,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 a161f127..90504d37 100644 --- a/notmuch.c +++ b/notmuch.c @@ -168,7 +168,7 @@ static command_t commands[] = { "Compact the notmuch database." }, { "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, @@ -460,7 +460,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" }, @@ -548,7 +548,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; diff --git a/test/T030-config.sh b/test/T030-config.sh index 67c9545c..14d1f4f2 100755 --- a/test/T030-config.sh +++ b/test/T030-config.sh @@ -96,14 +96,17 @@ test_expect_equal "$(notmuch --config=alt-config-link config get user.name)" \ test_begin_subtest "Writing config file through symlink follows symlink" test_expect_equal "$(readlink alt-config-link)" "alt-config" +db_path=${HOME}/database-path + test_begin_subtest "Absolute database path returned" -notmuch config set database.path ${HOME}/Maildir +mkdir -p ${db_path} +notmuch config set database.path ${db_path} test_expect_equal "$(notmuch config get database.path)" \ - "${HOME}/Maildir" + "${db_path}" test_begin_subtest "Relative database path properly expanded" -notmuch config set database.path Maildir +notmuch config set database.path ${db_path} test_expect_equal "$(notmuch config get database.path)" \ - "${HOME}/Maildir" + "${db_path}" test_done diff --git a/test/T590-libconfig.sh b/test/T590-libconfig.sh index 01a9ac06..cf294d04 100755 --- a/test/T590-libconfig.sh +++ b/test/T590-libconfig.sh @@ -626,9 +626,6 @@ EOF test_begin_subtest "notmuch_database_get_config (ndlc)" -echo NOTMUCH_CONFIG=$NOTMUCH_CONFIG -echo NOTMUCH_PROFILE=$NOTMUCH_PROFILE -echo HOME=$HOME cat c_head2 - c_tail <<'EOF' | test_C ${MAIL_DIR} %NULL% %NULL% { EXPECT0(notmuch_database_get_config (db, "test.key1", &val)); -- 2.30.0