From: David Bremner <david@tethera.net>
To: notmuch@notmuchmail.org
Cc: David Bremner <david@tethera.net>
Subject: [PATCH 04/21] CLI/show: complete conversion to new configuration framework.
Date: Wed, 17 Feb 2021 16:10:28 -0400 [thread overview]
Message-ID: <20210217201045.2021106-5-david@tethera.net> (raw)
In-Reply-To: <20210217201045.2021106-1-david@tethera.net>
In order to open the database in main() for this command, we may need
to re-open it in the (possibly less common) case where crypto options
require it.
---
notmuch-show.c | 26 +++++++-------------------
notmuch.c | 2 +-
test/T035-read-config.sh | 2 --
3 files changed, 8 insertions(+), 22 deletions(-)
diff --git a/notmuch-show.c b/notmuch-show.c
index c3c42caa..4a26f8ce 100644
--- a/notmuch-show.c
+++ b/notmuch-show.c
@@ -1215,9 +1215,8 @@ static const notmuch_show_format_t *formatters[] = {
};
int
-notmuch_show_command (notmuch_config_t *config, unused(notmuch_database_t *notmuch), int argc, char *argv[])
+notmuch_show_command (unused(notmuch_config_t *config), notmuch_database_t *notmuch, int argc, char *argv[])
{
- notmuch_database_t *notmuch;
notmuch_query_t *query;
char *query_string;
int opt_index, ret;
@@ -1234,7 +1233,7 @@ notmuch_show_command (notmuch_config_t *config, unused(notmuch_database_t *notmu
bool entire_thread_set = false;
bool single_message;
bool unthreaded = FALSE;
- char *status_string = NULL;
+ notmuch_status_t status;
notmuch_opt_desc_t options[] = {
{ .opt_keyword = &format, .name = "format", .keywords =
@@ -1324,25 +1323,14 @@ notmuch_show_command (notmuch_config_t *config, unused(notmuch_database_t *notmu
fprintf (stderr, "Warning: --include-html only implemented for format=text, format=json and format=sexp\n");
}
- notmuch_database_mode_t mode = NOTMUCH_DATABASE_MODE_READ_ONLY;
- if (params.crypto.decrypt == NOTMUCH_DECRYPT_TRUE)
- mode = NOTMUCH_DATABASE_MODE_READ_WRITE;
- if (notmuch_database_open_with_config (NULL,
- mode,
- _notmuch_config_get_path (config),
- NULL,
- ¬much,
- &status_string)) {
- if (status_string) {
- fputs (status_string, stderr);
- free (status_string);
+ if (params.crypto.decrypt == NOTMUCH_DECRYPT_TRUE) {
+ status = notmuch_database_reopen (notmuch, NOTMUCH_DATABASE_MODE_READ_WRITE);
+ if (status) {
+ fprintf (stderr, "Error reopening database for READ_WRITE: %s\n", notmuch_status_to_string (status));
+ return EXIT_FAILURE;
}
-
- return EXIT_FAILURE;
}
- config = NULL;
-
notmuch_exit_if_unmatched_db_uuid (notmuch);
query_string = query_string_from_args (notmuch, argc - opt_index, argv + opt_index);
diff --git a/notmuch.c b/notmuch.c
index 7360e0e6..71482e43 100644
--- a/notmuch.c
+++ b/notmuch.c
@@ -152,7 +152,7 @@ static command_t commands[] = {
"Search for messages matching the given search terms." },
{ "address", notmuch_address_command, NOTMUCH_COMMAND_DATABASE_EARLY,
"Get addresses from messages matching the given search terms." },
- { "show", notmuch_show_command, NOTMUCH_COMMAND_CONFIG_OPEN,
+ { "show", notmuch_show_command, NOTMUCH_COMMAND_DATABASE_EARLY,
"Show all messages matching the search terms." },
{ "count", notmuch_count_command, NOTMUCH_COMMAND_DATABASE_EARLY,
"Count messages matching the search terms." },
diff --git a/test/T035-read-config.sh b/test/T035-read-config.sh
index 205d1736..ac0f420b 100755
--- a/test/T035-read-config.sh
+++ b/test/T035-read-config.sh
@@ -378,7 +378,6 @@ restore_database
test_expect_equal "$output" "OK"
test_begin_subtest "show with alternate config (xdg)"
-test_subtest_known_broken
backup_database
notmuch tag -- +foobar17 '*'
xdg_config
@@ -389,7 +388,6 @@ restore_config
test_expect_equal "$output" "OK"
test_begin_subtest "show with alternate config (xdg+profile)"
-test_subtest_known_broken
backup_database
notmuch tag -- +foobar17 '*'
xdg_config foobar17
--
2.30.0
next prev parent reply other threads:[~2021-02-17 20:11 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-17 20:10 v2 flexible database location David Bremner
2021-02-17 20:10 ` [PATCH 01/21] lib: publish API for notmuch_database_reopen David Bremner
2021-02-17 20:10 ` [PATCH 02/21] lib: save path of xapian database in notmuch struct David Bremner
2021-02-17 20:10 ` [PATCH 03/21] lib: support reopening databases for write access David Bremner
2021-02-17 20:10 ` David Bremner [this message]
2021-02-17 20:10 ` [PATCH 05/21] lib/open: support NOTMUCH_DATABASE environment variable David Bremner
2021-02-17 20:10 ` [PATCH 06/21] lib/open: allocate notmuch_t struct early David Bremner
2021-02-17 20:10 ` [PATCH 07/21] lib: remove "path" from notmuch struct David Bremner
2021-02-17 20:10 ` [PATCH 08/21] lib/open: factor out library initialization David Bremner
2021-02-17 20:10 ` [PATCH 09/21] lib/open: reuse directory checks from n_d_c_with_config David Bremner
2021-02-17 20:10 ` [PATCH 10/21] lib/open: factor out the second half of n_d_open_with_config David Bremner
2021-02-17 20:10 ` [PATCH 11/21] lib/open: use _finish_open in n_d_create_with_config David Bremner
2021-02-17 20:10 ` [PATCH 12/21] lib/open: Use check for existing database by trial opening David Bremner
2021-02-17 20:10 ` [PATCH 13/21] support splitting mail from database location David Bremner
2021-02-17 20:10 ` [PATCH 14/21] lib/open: check for split configuration when creating database David Bremner
2021-02-17 20:10 ` [PATCH 15/21] CLI/new: support split database and mail location David Bremner
2021-02-17 20:10 ` [PATCH 16/21] lib/open: support XDG_DATA_HOME as a fallback database location David Bremner
2021-02-17 20:10 ` [PATCH 17/21] CLI/insert: support split database and mail root David Bremner
2021-02-17 20:10 ` [PATCH 18/21] lib/compact: enable split config David Bremner
2021-02-17 20:10 ` [PATCH 19/21] lib/open: fix hook directory calculation in split configuration David Bremner
2021-02-17 20:10 ` [PATCH 20/21] lib/config: add configuration variable for backup directory David Bremner
2021-02-17 20:10 ` [PATCH 21/21] CLI/new: use " David Bremner
2021-03-06 18:40 ` Notmuch and backups Matt Armstrong
2021-03-07 17:51 ` 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=20210217201045.2021106-5-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).