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 oDgrELd4LWBvEQAA0tVLHw (envelope-from ) for ; Wed, 17 Feb 2021 20:12:39 +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 8NQLDLd4LWA4ZgAAB5/wlQ (envelope-from ) for ; Wed, 17 Feb 2021 20:12:39 +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)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id C445C21477 for ; Wed, 17 Feb 2021 21:12:38 +0100 (CET) Received: from nmbug.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id 6939027054; Wed, 17 Feb 2021 15:11:33 -0500 (EST) Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) by mail.notmuchmail.org (Postfix) with ESMTP id D449226ACE for ; Wed, 17 Feb 2021 15:11:06 -0500 (EST) Received: by fethera.tethera.net (Postfix, from userid 1001) id CC6846067D; Wed, 17 Feb 2021 15:11:06 -0500 (EST) Received: (nullmailer pid 2021440 invoked by uid 1000); Wed, 17 Feb 2021 20:10:50 -0000 From: David Bremner To: notmuch@notmuchmail.org Cc: David Bremner Subject: [PATCH 17/21] CLI/insert: support split database and mail root Date: Wed, 17 Feb 2021 16:10:41 -0400 Message-Id: <20210217201045.2021106-18-david@tethera.net> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210217201045.2021106-1-david@tethera.net> References: <20210217201045.2021106-1-david@tethera.net> MIME-Version: 1.0 Message-ID-Hash: 6PFCT4GOKWFF6II7Y35FF64GWZXXDUJO X-Message-ID-Hash: 6PFCT4GOKWFF6II7Y35FF64GWZXXDUJO 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.56 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: C445C21477 X-Spam-Score: 0.56 X-Migadu-Scanner: scn1.migadu.com X-TUID: gQ/ozcYnFE7Z The new test is in T055-path-config because it uses the helper function split_config, and because it seems easier to follow the database path related tests in one place. --- notmuch-insert.c | 12 +++--------- test/T055-path-config.sh | 10 ++++++++++ 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/notmuch-insert.c b/notmuch-insert.c index 0f272e2e..38a0dfe6 100644 --- a/notmuch-insert.c +++ b/notmuch-insert.c @@ -448,7 +448,7 @@ notmuch_insert_command (unused(notmuch_config_t *config),notmuch_database_t *not { notmuch_status_t status, close_status; struct sigaction action; - const char *db_path; + const char *mail_root; notmuch_config_values_t *new_tags = NULL; tag_op_list_t *tag_ops; char *query_string = NULL; @@ -480,13 +480,7 @@ notmuch_insert_command (unused(notmuch_config_t *config),notmuch_database_t *not notmuch_process_shared_options (argv[0]); - - db_path = notmuch_config_get (notmuch, NOTMUCH_CONFIG_DATABASE_PATH); - - if (! db_path) - INTERNAL_ERROR ("Unable to retrieve database path"); - else - db_path = talloc_strdup (local, db_path); + mail_root = notmuch_config_get (notmuch, NOTMUCH_CONFIG_MAIL_ROOT); new_tags = notmuch_config_get_values (notmuch, NOTMUCH_CONFIG_NEW_TAGS); @@ -532,7 +526,7 @@ notmuch_insert_command (unused(notmuch_config_t *config),notmuch_database_t *not return EXIT_FAILURE; } - maildir = talloc_asprintf (local, "%s/%s", db_path, folder); + maildir = talloc_asprintf (local, "%s/%s", mail_root, folder); if (! maildir) { fprintf (stderr, "Out of memory\n"); return EXIT_FAILURE; diff --git a/test/T055-path-config.sh b/test/T055-path-config.sh index f9a8e200..fb5174ac 100755 --- a/test/T055-path-config.sh +++ b/test/T055-path-config.sh @@ -167,6 +167,16 @@ On Tue, 05 Jan 2010 15:43:56 -0000, Sender wrote: > basic reply test EOF test_expect_equal_file EXPECTED OUTPUT + test_begin_subtest "insert+search ($config)" + generate_message \ + "[subject]=\"insert-subject\"" \ + "[date]=\"Sat, 01 Jan 2000 12:00:00 -0000\"" \ + "[body]=\"insert-message\"" + mkdir -p "$MAIL_DIR"/{cur,new,tmp} + notmuch insert < "$gen_msg_filename" + cur_msg_filename=$(notmuch search --output=files "subject:insert-subject") + test_expect_equal_file "$cur_msg_filename" "$gen_msg_filename" + restore_config done -- 2.30.0