From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id cCw5Km3hQGAoMwAA0tVLHw (envelope-from ) for ; Thu, 04 Mar 2021 13:32:29 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id iJYVJm3hQGAHLwAA1q6Kng (envelope-from ) for ; Thu, 04 Mar 2021 13:32:29 +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 430BC16AB0 for ; Thu, 4 Mar 2021 14:32:29 +0100 (CET) Received: from nmbug.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id 1F27527C59; Thu, 4 Mar 2021 08:31:56 -0500 (EST) Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) by mail.notmuchmail.org (Postfix) with ESMTP id 907E12756F for ; Thu, 4 Mar 2021 08:31:39 -0500 (EST) Received: by fethera.tethera.net (Postfix, from userid 1001) id 626455FA96; Thu, 4 Mar 2021 08:31:39 -0500 (EST) Received: (nullmailer pid 4053580 invoked by uid 1000); Thu, 04 Mar 2021 13:31:28 -0000 From: David Bremner To: notmuch@notmuchmail.org Cc: David Bremner Subject: [PATCH 18/22] CLI/insert: support split database and mail root Date: Thu, 4 Mar 2021 09:31:21 -0400 Message-Id: <20210304133125.4050229-19-david@tethera.net> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210304133125.4050229-1-david@tethera.net> References: <20210304133125.4050229-1-david@tethera.net> MIME-Version: 1.0 Message-ID-Hash: 2O4NYBYA7TLPJI4KJVEZ5RW3F6STR7C3 X-Message-ID-Hash: 2O4NYBYA7TLPJI4KJVEZ5RW3F6STR7C3 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=1614864749; 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=XYJ7XG/ngn2CQbEMAR1uvelkgFNKM4IOewmGVGDJk0Q=; b=cb1aqdBIZ98tBhZiCcFbWON6ZYZZ5cOzZ5jdJJeh9AJcYXidql7SoFkQrfbdA7AZTeZ5lb G+d0UNgbngOcP6QEwrpnuap/JmKgyGpCOF08E3LVYOl+PX8NLjH7o5aLNsHKWGyB9Z37Dk KpFZJkwdJMtCwrtIauptEYWU9CQMhyncqiYwKSIDrKFmWq2USE3+bAOuZ+DTsJdFWlZKA4 fslHNVqb85LmIHp52tswwMLopY1FEwmg8FjaqTmMYyRyIJkHZzUMeUl82k0UIDY7s8Ouwt 9xj7Lp+Er2nnF5kSszDytBzRbeF1EIhs8NoggGJD5OFB7YXwu9yTEnqnWDHm/Q== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1614864749; a=rsa-sha256; cv=none; b=eTZDQNO0cnQyj6wvU1IukXtDxGTdSY+Ru4nLA8otE7sCrwoXui2g4llfGEr+3A009xHRMb 9UtvcjO2QhBjZL2mhV1WF/8KtlS4+lHjgXPSucloqfjivjVDnD6a4rhy7nPF444is+sENp +9R0S7YJUQxj4G6WbjMm3p7NZ5orMsADNuSTOH0WJEKgUMecOXp4/8JT+m/StRUO3tc8AD D7ba7/Ww+s9SpjR00HgwjiDHePJgVMMWUCCUWBKjZ6Fo9ely4ubg59hEx5Ndl5uCTS/KiT fTp1IWsHU6GSWlffxLlyIY8J+6QXBjRnbxzdFI2dIj+qOnTnZ7ymshJ5gZw3rA== ARC-Authentication-Results: i=1; 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-Spam-Score: -1.03 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: 430BC16AB0 X-Spam-Score: -1.03 X-Migadu-Scanner: scn0.migadu.com X-TUID: woHjRcbphPYs 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.1