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 4B4wMPYXTmAKdAAA0tVLHw (envelope-from ) for ; Sun, 14 Mar 2021 14:04:38 +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 uMISLPYXTmCTLAAA1q6Kng (envelope-from ) for ; Sun, 14 Mar 2021 14:04:38 +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)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 18F2E12BCE for ; Sun, 14 Mar 2021 15:04:38 +0100 (CET) Received: from nmbug.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id A0C1928CB1; Sun, 14 Mar 2021 10:03:06 -0400 (EDT) Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) by mail.notmuchmail.org (Postfix) with ESMTP id 9705027C59 for ; Sun, 14 Mar 2021 10:02:40 -0400 (EDT) Received: by fethera.tethera.net (Postfix, from userid 1001) id 8EC875FA96; Sun, 14 Mar 2021 10:02:40 -0400 (EDT) Received: (nullmailer pid 183669 invoked by uid 1000); Sun, 14 Mar 2021 14:02:19 -0000 From: David Bremner To: notmuch@notmuchmail.org Cc: David Bremner Subject: [PATCH 18/22] CLI/insert: support split database and mail root Date: Sun, 14 Mar 2021 11:02:13 -0300 Message-Id: <20210314140217.183425-19-david@tethera.net> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210314140217.183425-1-david@tethera.net> References: <20210314140217.183425-1-david@tethera.net> MIME-Version: 1.0 Message-ID-Hash: HSPDO37TD4YRH3BSQKWBBAQZPYYRC52I X-Message-ID-Hash: HSPDO37TD4YRH3BSQKWBBAQZPYYRC52I 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=1615730678; 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=899vEQBgcm6A6Z2rbARmsVrRdNcLEkz60WKe9Khrupk=; b=dckr3/gO34JOJBlrGw3L5vVExgjzEq4zvfz4ntehVJsk8ef9FnMq6xZUWNdKw4OWk6xq4D 0oAjJE6RJVxWAfnSs/8pqizdKKfBrwDgb6gpKXLrhxNKZR2AhMAyEeCdCEi//89XjSIo0C lwzSha1nwy9/NbI69qTzq84VM3TzK4C039ip0Iw/H8WnVsmGTr8c1D3mJOMKIC/HFQ7Gbs a7VQt0Woppx/ylv//i26EsNgLvSkNUKPR4PNSmXpB9vAzlHe152qVIAf4AmmudnaBH64ej YdrkAY9GKxaHxqgW/627TTsu0H0WWNIm3vLKDbrQ05CRml9c96xoLMSemoa1ug== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1615730678; a=rsa-sha256; cv=none; b=TYhIH8McNrExKVkIGxTBjObWMoMv3vDDC76qXa3k4wUxz0iZ4Vm9S4QQUyDm4LZAL+qNtY TXJyFCZdZdw/h7gmFIZQ1o1LfH/tAiG7H65okl0+ish+/vs5mBUALcQ/djl5BHUNdHTX1H Y61LEBQpfoSSt7gM1lhmXWMWlXsezDXwmaRXjGcH8dQSnzwnBe3TWLTj27zzKWWeoWsJi0 KyERTJo9kjXMuePIg3HX4Aa+ov2ksuhrSxCRt1TecBj+C2ueTCe3Hmu0+1R5IE5EEUnci9 VfTQlVGcMp7mfa42tEg/I5mx2ocb0Y+mxMBABWWy+23i8CjVRpzOieToTeoM9g== 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.09 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: 18F2E12BCE X-Spam-Score: -1.09 X-Migadu-Scanner: scn0.migadu.com X-TUID: xzXR/tMqj5jN The new test is in T055-path-config because it uses the helper function split_config, and because it seems easier to put 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 cc5aeefc..865b6b69 100644 --- a/notmuch-insert.c +++ b/notmuch-insert.c @@ -449,7 +449,7 @@ notmuch_insert_command (unused(notmuch_config_t *config), notmuch_database_t *no { 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; @@ -481,13 +481,7 @@ notmuch_insert_command (unused(notmuch_config_t *config), notmuch_database_t *no 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); @@ -533,7 +527,7 @@ notmuch_insert_command (unused(notmuch_config_t *config), notmuch_database_t *no 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