From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:bcc0::]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id mN23GKoRbWDWHgEAgWs5BA (envelope-from ) for ; Wed, 07 Apr 2021 03:58:02 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id eC2YEqoRbWCaSAAAbx9fmQ (envelope-from ) for ; Wed, 07 Apr 2021 01:58:02 +0000 Received: from mail.notmuchmail.org (nmbug.tethera.net [IPv6:2607:5300:201:3100::1657]) (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 BA8CAAEAB for ; Wed, 7 Apr 2021 03:58:01 +0200 (CEST) Received: from nmbug.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id 564C3290C5; Tue, 6 Apr 2021 21:56:46 -0400 (EDT) Received: from fethera.tethera.net (fethera.tethera.net [IPv6:2607:5300:60:c5::1]) by mail.notmuchmail.org (Postfix) with ESMTP id ED6AA2905E for ; Tue, 6 Apr 2021 21:56:01 -0400 (EDT) Received: by fethera.tethera.net (Postfix, from userid 1001) id E2E3F5FA96; Tue, 6 Apr 2021 21:56:01 -0400 (EDT) Received: (nullmailer pid 2964236 invoked by uid 1000); Wed, 07 Apr 2021 01:55:35 -0000 From: David Bremner To: notmuch@notmuchmail.org Cc: David Bremner Subject: [PATCH 15/28] CLI/config: switch "notmuch config list" to merged config Date: Tue, 6 Apr 2021 22:55:17 -0300 Message-Id: <20210407015530.2964017-16-david@tethera.net> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210407015530.2964017-1-david@tethera.net> References: <20210407015530.2964017-1-david@tethera.net> MIME-Version: 1.0 Message-ID-Hash: 2CNXNGNBQZPZCM3ZOQTWOFRAEKWL7DJK X-Message-ID-Hash: 2CNXNGNBQZPZCM3ZOQTWOFRAEKWL7DJK 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 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1617760682; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=EKXYpLb6eJt+bacrkw3jscUd79q2HPTc6WFaoAlHZao=; b=By61WKHbZ/0m2nFrRySj27rus0gVM4sHtajv6JaRDStGty9phEKKm+CF+apx9dMqeFmR8C iwts5jCbRBOyY3HNqPRhMxLzBSF5ga0a7MuXKhrGgsAhlOjwW+ICVYKwNdTeF3D+Gl9Fw+ agaq0ECQtCLZOulEFrqKpdU+lCHWvABSZkfbjXCo7iYDhFDO0jWTwBUcZrKjbIsupsC3Ii 3iwepZU/g2zo7BisclCvuMl+fg8SGVYodfYfPupfDPrXPHbQcQQlixq6AX6O4LE9Ou7/7p kbTzTXN4mU/vcg8er+5f2XKpU41R49EwvbJIQK+egwvNXeZCrRBz7j1zNhb6CQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1617760682; a=rsa-sha256; cv=none; b=vBXxp+SRCWGXuFfZhnMjQGqYg/f0XnZQglWElV+OIWUISsMaJxBBqnvHq/NUU5OGr5qTpt gYCgEw3XNnZcRva3c3JswK0GJTsBcW+QXFCPrGLdJv9kqPTPIu7gfmwsetAqUtVVYHIsxZ /2vfA/5S+rN0gAvOr1HQS+soV1hhQ3Saz6ZvMKbyIfcevmAAlIT9rhd2qu76KG0L7g1Kxx L487eFf1+uw7uppxJFQDW7TLbtK/8/Lqc+robPwplw0qPa56XDSrC1IvFC/627R1h8Fe9L OHyeGz5qA/IJeJ4aOzZrxyDqjQp28Vr2Vxk5MIPH0BUfvvs9W2hGEtspmNd5uA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 2607:5300:201:3100::1657 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Spam-Score: -0.88 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 2607:5300:201:3100::1657 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Queue-Id: BA8CAAEAB X-Spam-Score: -0.88 X-Migadu-Scanner: scn0.migadu.com X-TUID: JW88R0Y5/w00 Use the database opened at the top level rather than opening another notmuch_database_t. Test output changes because keys are now listed in alphabetical order, and because a missing database is no longer an error. --- notmuch-config.c | 69 ++++++++------------------------------------- test/T030-config.sh | 27 ++++++++---------- 2 files changed, 23 insertions(+), 73 deletions(-) diff --git a/notmuch-config.c b/notmuch-config.c index 50008f78..ae315cb7 100644 --- a/notmuch-config.c +++ b/notmuch-config.c @@ -972,69 +972,22 @@ _notmuch_config_list_built_with () } static int -_list_db_config (notmuch_config_t *config) +notmuch_config_command_list (notmuch_database_t *notmuch) { - notmuch_database_t *notmuch; - notmuch_config_list_t *list; - - if (notmuch_database_open (notmuch_config_get_database_path (config), - NOTMUCH_DATABASE_MODE_READ_ONLY, ¬much)) - return EXIT_FAILURE; + notmuch_config_pairs_t *list; - /* XXX Handle UUID mismatch? */ - - - if (print_status_database ("notmuch config", notmuch, - notmuch_database_get_config_list (notmuch, "", &list))) - return EXIT_FAILURE; - - for (; notmuch_config_list_valid (list); notmuch_config_list_move_to_next (list)) { - printf ("%s=%s\n", notmuch_config_list_key (list), notmuch_config_list_value (list)); + _notmuch_config_list_built_with (); + for (list = notmuch_config_get_pairs (notmuch, ""); + notmuch_config_pairs_valid (list); + notmuch_config_pairs_move_to_next (list)) { + const char *value = notmuch_config_pairs_value (list); + if (value) + printf ("%s=%s\n", notmuch_config_pairs_key (list), value); } - notmuch_config_list_destroy (list); - + notmuch_config_pairs_destroy (list); return EXIT_SUCCESS; } -static int -notmuch_config_command_list (notmuch_config_t *config) -{ - char **groups; - size_t g, groups_length; - - groups = g_key_file_get_groups (config->key_file, &groups_length); - if (groups == NULL) - return 1; - - for (g = 0; g < groups_length; g++) { - char **keys; - size_t k, keys_length; - - keys = g_key_file_get_keys (config->key_file, - groups[g], &keys_length, NULL); - if (keys == NULL) - continue; - - for (k = 0; k < keys_length; k++) { - char *value; - - value = g_key_file_get_string (config->key_file, - groups[g], keys[k], NULL); - if (value != NULL) { - printf ("%s.%s=%s\n", groups[g], keys[k], value); - free (value); - } - } - - g_strfreev (keys); - } - - g_strfreev (groups); - - _notmuch_config_list_built_with (); - return _list_db_config (config); -} - int notmuch_config_command (notmuch_config_t *config, notmuch_database_t *notmuch, int argc, char *argv[]) @@ -1074,7 +1027,7 @@ notmuch_config_command (notmuch_config_t *config, notmuch_database_t *notmuch, } ret = notmuch_config_command_set (config, argv[1], argc - 2, argv + 2); } else if (strcmp (argv[0], "list") == 0) { - ret = notmuch_config_command_list (config); + ret = notmuch_config_command_list (notmuch); } else { fprintf (stderr, "Unrecognized argument for notmuch config: %s\n", argv[0]); diff --git a/test/T030-config.sh b/test/T030-config.sh index ba29cbac..ffbd7681 100755 --- a/test/T030-config.sh +++ b/test/T030-config.sh @@ -46,25 +46,22 @@ notmuch config set foo.nonexistent test_expect_equal "$(notmuch config get foo.nonexistent)" "" test_begin_subtest "List all items" -notmuch config list > STDOUT 2> STDERR -printf "%s\n====\n%s\n" "$(< STDOUT)" "$(< STDERR)" | notmuch_config_sanitize > OUTPUT - +notmuch config list 2>&1 | notmuch_config_sanitize > OUTPUT cat < EXPECTED -database.path=MAIL_DIR -user.name=Notmuch Test Suite -user.primary_email=test_suite@notmuchmail.org -user.other_email=test_suite_other@notmuchmail.org;test_suite@otherdomain.org -new.tags=unread;inbox; -new.ignore= -search.exclude_tags= -maildir.synchronize_flags=true -foo.string=this is another string value -foo.list=this;is another;list value; built_with.compact=something built_with.field_processor=something built_with.retry_lock=something -==== -Error: Cannot open database at MAIL_DIR/.notmuch: No such file or directory. +database.mail_root=MAIL_DIR +database.path=MAIL_DIR +foo.list=this;is another;list value; +foo.string=this is another string value +maildir.synchronize_flags=true +new.ignore= +new.tags=unread;inbox; +search.exclude_tags= +user.name=Notmuch Test Suite +user.other_email=test_suite_other@notmuchmail.org;test_suite@otherdomain.org +user.primary_email=test_suite@notmuchmail.org EOF test_expect_equal_file EXPECTED OUTPUT -- 2.30.2