From: David Bremner <david@tethera.net>
To: notmuch@notmuchmail.org
Subject: [PATCH 6/6] lib/message-file: allow disabling check for mbox files.
Date: Sat, 5 Feb 2022 15:52:15 -0400 [thread overview]
Message-ID: <20220205195215.166213-7-david@tethera.net> (raw)
In-Reply-To: <20220205195215.166213-1-david@tethera.net>
This does not change the default (of enforcing the check) but does
allow users to disable the check if they want.
---
lib/message-file.c | 9 +++++++--
test/T050-new.sh | 1 -
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/lib/message-file.c b/lib/message-file.c
index 0f356cf1..e2bd406b 100644
--- a/lib/message-file.c
+++ b/lib/message-file.c
@@ -145,14 +145,19 @@ _notmuch_message_file_parse (notmuch_message_file_t *message)
GMimeParser *parser;
notmuch_status_t status = NOTMUCH_STATUS_SUCCESS;
bool is_mbox;
+ notmuch_bool_t check_mbox;
if (message->message)
return NOTMUCH_STATUS_SUCCESS;
- is_mbox = _is_mbox (message->stream);
-
_notmuch_init ();
+ status = notmuch_config_get_bool (message->notmuch, NOTMUCH_CONFIG_CHECK_MBOX, &check_mbox);
+ if (status)
+ return status;
+
+ is_mbox = check_mbox && _is_mbox (message->stream);
+
message->headers = g_hash_table_new_full (strcase_hash, strcase_equal,
free, g_free);
if (! message->headers)
diff --git a/test/T050-new.sh b/test/T050-new.sh
index e779bd2f..aa777235 100755
--- a/test/T050-new.sh
+++ b/test/T050-new.sh
@@ -464,7 +464,6 @@ output=$(notmuch search --output=messages id:87k0e9o0pu.fsf@tethera.net)
test_expect_equal "$output" "id:87k0e9o0pu.fsf@tethera.net"
test_begin_subtest "id:87k0e9o0pu.fsf@tethera.net is indexed with index.check_mbox=false"
-test_subtest_known_broken
cp notmuch-config notmuch-config.old
notmuch config set index.check_mbox false
notmuch new
--
2.34.1
next prev parent reply other threads:[~2022-02-05 19:52 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-05 19:52 allow disabling the check for multi-message mboxes David Bremner
2022-02-05 19:52 ` [PATCH 1/6] test: start new corpus of test messages for indexing code David Bremner
2022-02-05 19:52 ` [PATCH 2/6] test: add known broken test for non-email false positive David Bremner
2022-02-05 19:52 ` [PATCH 3/6] lib/config: add configuration item for controlling check for mbox David Bremner
2022-02-05 19:52 ` [PATCH 4/6] test: add known broken test for index.check_mbox=false David Bremner
2022-02-05 19:52 ` [PATCH 5/6] lib/message-file: stash pointer to "parent" notmuch database David Bremner
2022-02-05 19:52 ` David Bremner [this message]
2022-02-06 19:42 ` [PATCH] doc: document index.check_mbox option David Bremner
2022-02-08 20:58 ` allow disabling the check for multi-message mboxes David Bremner
2022-02-20 13:23 ` 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=20220205195215.166213-7-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).