From: Todd <todd@electricoding.com>
To: notmuch@notmuchmail.org
Subject: [PATCH v4 3/5] Add indexing for the mimetype term
Date: Thu, 22 Jan 2015 17:43:38 -0600 [thread overview]
Message-ID: <1421970220-9019-4-git-send-email-todd@electricoding.com> (raw)
In-Reply-To: <1421970220-9019-1-git-send-email-todd@electricoding.com>
In-Reply-To: <1420849787-4401-1-git-send-email-todd@electricoding.com>
This adds the indexing support for the "mimetype:" term and removes
the broken test flag. The indexing is probablistic in Xapian terms,
which gives a better experience to end users. Standard content-types
of the form "foo/bar" are automatically interpreted as phrases in
Xapian due to the embedded slash.
Assume, separate messages with application/pdf and application/x-pdf
are indexed, then:
- mimetype:application/x-pdf will find only the application/x-pdf
- mimetype:application/pdf will find only the application/pdf
- mimetype:pdf will find both of the messages
---
lib/database.cc | 1 +
lib/index.cc | 10 ++++++++++
test/T190-multipart.sh | 3 ---
3 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/lib/database.cc b/lib/database.cc
index 0d2c417..3974e2e 100644
--- a/lib/database.cc
+++ b/lib/database.cc
@@ -254,6 +254,7 @@ static prefix_t PROBABILISTIC_PREFIX[]= {
{ "from", "XFROM" },
{ "to", "XTO" },
{ "attachment", "XATTACHMENT" },
+ { "mimetype", "XMIMETYPE"},
{ "subject", "XSUBJECT"},
};
diff --git a/lib/index.cc b/lib/index.cc
index 1a2e63d..c88ed8d 100644
--- a/lib/index.cc
+++ b/lib/index.cc
@@ -318,6 +318,16 @@ _index_mime_part (notmuch_message_t *message,
return;
}
+ GMimeContentType *content_type = g_mime_object_get_content_type(part);
+ if (content_type) {
+ char *mime_string = g_mime_content_type_to_string(content_type);
+ if (mime_string)
+ {
+ _notmuch_message_gen_terms (message, "mimetype", mime_string);
+ g_free(mime_string);
+ }
+ }
+
if (GMIME_IS_MULTIPART (part)) {
GMimeMultipart *multipart = GMIME_MULTIPART (part);
int i;
diff --git a/test/T190-multipart.sh b/test/T190-multipart.sh
index a97dc28..ad8d29e 100755
--- a/test/T190-multipart.sh
+++ b/test/T190-multipart.sh
@@ -752,17 +752,14 @@ notmuch show --format=json --include-html id:htmlmessage > OUTPUT
test_expect_equal_json "$(cat OUTPUT)" "$(cat EXPECTED.withhtml)"
test_begin_subtest "indexes mime-type #1"
-test_subtest_known_broken
output=$(notmuch search mimetype:application/unique_identifier | notmuch_search_sanitize)
test_expect_equal "$output" "thread:XXX 2014-01-12 [1/1] Todd; odd content types (inbox unread)"
test_begin_subtest "indexes mime-type #2"
-test_subtest_known_broken
output=$(notmuch search mimetype:text/some_other_identifier | notmuch_search_sanitize)
test_expect_equal "$output" "thread:XXX 2014-01-12 [1/1] Todd; odd content types (inbox unread)"
test_begin_subtest "indexes mime-type #3"
-test_subtest_known_broken
output=$(notmuch search from:todd and mimetype:multipart/alternative | notmuch_search_sanitize)
test_expect_equal "$output" "thread:XXX 2014-01-12 [1/1] Todd; odd content types (inbox unread)"
--
1.9.1
next prev parent reply other threads:[~2015-01-22 23:44 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-10 0:29 [PATCH] Index Content-Type of attachments with a contenttype prefix Todd
2015-01-10 9:00 ` David Bremner
2015-01-10 14:22 ` Todd
2015-01-10 12:13 ` Jani Nikula
2015-01-10 14:38 ` Todd
2015-01-14 0:00 ` [PATCH v2 0/5] Index the content-type of MIME parts Todd
2015-01-14 0:00 ` [PATCH v2 1/5] Add a failing unit test for indexed mime types Todd
2015-01-15 17:09 ` Jani Nikula
2015-01-15 17:19 ` Jani Nikula
2015-01-14 0:00 ` [PATCH v2 2/5] Add the NOTMUCH_FEATURE_INDEXED_MIMETYPES database feature Todd
2015-01-15 17:20 ` Jani Nikula
2015-01-15 18:57 ` Austin Clements
2015-01-14 0:00 ` [PATCH v2 3/5] Add indexing for the mimetype term Todd
2015-01-15 17:16 ` Jani Nikula
2015-01-14 0:00 ` [PATCH v2 4/5] Update completions for Emacs and bash Todd
2015-01-15 17:17 ` Jani Nikula
2015-01-14 0:00 ` [PATCH v2 5/5] Update documentation Todd
2015-01-16 0:30 ` [PATCH v3 1/5] Add failing unit tests for indexed mime types Todd
2015-01-17 10:44 ` David Bremner
2015-01-16 0:30 ` [PATCH v3 2/5] Add the NOTMUCH_FEATURE_INDEXED_MIMETYPES database feature Todd
2015-01-16 0:30 ` [PATCH v3 3/5] Add indexing for the mimetype term Todd
2015-01-17 15:21 ` David Bremner
2015-01-17 16:41 ` Todd
2015-01-16 0:30 ` [PATCH v3 4/5] Update completions for Emacs and bash Todd
2015-01-16 0:30 ` [PATCH v3 5/5] Update documentation Todd
2015-01-17 15:28 ` David Bremner
2015-01-22 23:43 ` [PATCH v4 0/5] Index the content-type of MIME parts Todd
2015-01-24 15:57 ` David Bremner
2015-01-22 23:43 ` [PATCH v4 1/5] test: Add failing unit tests for indexed mime types Todd
2015-01-22 23:43 ` [PATCH v4 2/5] Add the NOTMUCH_FEATURE_INDEXED_MIMETYPES database feature Todd
2015-01-22 23:43 ` Todd [this message]
2015-01-22 23:43 ` [PATCH v4 4/5] Update completions for Emacs and bash Todd
2015-01-22 23:43 ` [PATCH v4 5/5] Update documentation Todd
2015-01-23 19:11 ` Jani Nikula
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=1421970220-9019-4-git-send-email-todd@electricoding.com \
--to=todd@electricoding.com \
--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).