From: David Bremner <david@tethera.net>
To: notmuch@notmuchmail.org
Cc: David Bremner <david@tethera.net>
Subject: [PATCH 18/22] CLI/insert: support split database and mail root
Date: Thu, 4 Mar 2021 09:31:21 -0400 [thread overview]
Message-ID: <20210304133125.4050229-19-david@tethera.net> (raw)
In-Reply-To: <20210304133125.4050229-1-david@tethera.net>
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 <sender@example.com> 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
next prev parent reply other threads:[~2021-03-04 13:32 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-04 13:31 v2 support flexible database location David Bremner
2021-03-04 13:31 ` [PATCH 01/22] test/setup: add check for config exists, but no database David Bremner
2021-03-04 13:31 ` [PATCH 02/22] lib: publish API for notmuch_database_reopen David Bremner
2021-03-04 13:31 ` [PATCH 03/22] lib: save path of xapian database in notmuch struct David Bremner
2021-03-04 13:31 ` [PATCH 04/22] lib: support reopening databases for write access David Bremner
2021-03-04 13:31 ` [PATCH 05/22] CLI/show: complete conversion to new configuration framework David Bremner
2021-03-04 13:31 ` [PATCH 06/22] lib/open: support NOTMUCH_DATABASE environment variable David Bremner
2021-03-04 13:31 ` [PATCH 07/22] lib/open: allocate notmuch_t struct early David Bremner
2021-03-04 13:31 ` [PATCH 08/22] lib: remove "path" from notmuch struct David Bremner
2021-03-04 13:31 ` [PATCH 09/22] lib/open: factor out library initialization David Bremner
2021-03-04 13:31 ` [PATCH 10/22] lib/open: reuse directory checks from n_d_c_with_config David Bremner
2021-03-04 13:31 ` [PATCH 11/22] lib/open: factor out the second half of n_d_open_with_config David Bremner
2021-03-04 13:31 ` [PATCH 12/22] lib/open: use _finish_open in n_d_create_with_config David Bremner
2021-03-04 13:31 ` [PATCH 13/22] lib/open: Use check for existing database by trial opening David Bremner
2021-03-04 13:31 ` [PATCH 14/22] support splitting mail from database location David Bremner
2021-03-04 13:31 ` [PATCH 15/22] lib/open: check for split configuration when creating database David Bremner
2021-03-04 13:31 ` [PATCH 16/22] CLI/new: support split database and mail location David Bremner
2021-03-04 13:31 ` [PATCH 17/22] lib/open: support XDG_DATA_HOME as a fallback database location David Bremner
2021-03-04 13:31 ` David Bremner [this message]
2021-03-04 13:31 ` [PATCH 19/22] lib/compact: enable split config David Bremner
2021-03-04 13:31 ` [PATCH 20/22] lib/open: fix hook directory calculation in split configuration David Bremner
2021-03-04 13:31 ` [PATCH 21/22] lib/config: add configuration variable for backup directory David Bremner
2021-03-04 13:31 ` [PATCH 22/22] CLI/new: use " David Bremner
-- strict thread matches above, loose matches on Subject: below --
2021-03-07 17:27 v3 support flexible database location David Bremner
2021-03-07 17:27 ` [PATCH 18/22] CLI/insert: support split database and mail root David Bremner
2021-03-14 14:01 v4 flexible path location David Bremner
2021-03-14 14:02 ` [PATCH 18/22] CLI/insert: support split database and mail root David Bremner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210304133125.4050229-19-david@tethera.net \
--to=david@tethera.net \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).