This probably needs a stricter test, perhaps an explicit list of (regexes? for) allowed types. --- lib/index.cc | 23 ++++++++++++++++++++--- test/T050-new.sh | 1 - 2 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/lib/index.cc b/lib/index.cc index 728bfb22..aca73580 100644 --- a/lib/index.cc +++ b/lib/index.cc @@ -380,6 +380,21 @@ _index_pkcs7_part (notmuch_message_t *message, GMimeObject *part, _notmuch_message_crypto_t *msg_crypto); +static bool _indexable_mime_type (GMimeObject *part) { + GMimeContentType *content_type = g_mime_object_get_content_type (part); + + if (content_type) { + char *mime_string = g_mime_content_type_get_mime_type (content_type); + if (mime_string) { + /* XXX TODO: use a more sensible test, maybe configurable */ + bool ret = (STRNCMP_LITERAL (mime_string, "text/") == 0); + g_free (mime_string); + return ret; + } + } + return false; +} + /* Callback to generate terms for each mime part of a message. */ static void _index_mime_part (notmuch_message_t *message, @@ -497,9 +512,11 @@ _index_mime_part (notmuch_message_t *message, _notmuch_message_add_term (message, "tag", "attachment"); _notmuch_message_gen_terms (message, "attachment", filename); - /* XXX: Would be nice to call out to something here to parse - * the attachment into text and then index that. */ - goto DONE; + if (! _indexable_mime_type (part)) { + /* XXX: Would be nice to call out to something here to parse + * the attachment into text and then index that. */ + goto DONE; + } } byte_array = g_byte_array_new (); diff --git a/test/T050-new.sh b/test/T050-new.sh index cb67889c..dd665de3 100755 --- a/test/T050-new.sh +++ b/test/T050-new.sh @@ -458,7 +458,6 @@ test_expect_equal_file EXPECTED OUTPUT add_email_corpus indexing test_begin_subtest "index text/* attachments" -test_subtest_known_broken notmuch search id:20200930101213.2m2pt3jrspvcrxfx@localhost.localdomain > EXPECTED notmuch search id:20200930101213.2m2pt3jrspvcrxfx@localhost.localdomain and ersatz > OUTPUT test_expect_equal_file_nonempty EXPECTED OUTPUT -- 2.35.1 _______________________________________________ notmuch mailing list -- notmuch@notmuchmail.org To unsubscribe send an email to notmuch-le...@notmuchmail.org