From: Todd Date: Sat, 10 Jan 2015 00:29:47 +0000 (+1800) Subject: [PATCH] Index Content-Type of attachments with a contenttype prefix X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6a24e8e630a9e1ab6cce530b3ea470ead693fb2b;p=notmuch-archives.git [PATCH] Index Content-Type of attachments with a contenttype prefix --- diff --git a/fe/098b937c16c9e0e71295f8dc8fa91fd6cd79e0 b/fe/098b937c16c9e0e71295f8dc8fa91fd6cd79e0 new file mode 100644 index 000000000..f3c0b9758 --- /dev/null +++ b/fe/098b937c16c9e0e71295f8dc8fa91fd6cd79e0 @@ -0,0 +1,229 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 3394F431FBD + for ; Fri, 9 Jan 2015 16:30:17 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 2.438 +X-Spam-Level: ** +X-Spam-Status: No, score=2.438 tagged_above=-999 required=5 + tests=[DNS_FROM_AHBL_RHSBL=2.438] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id gVjugoKF6U32 for ; + Fri, 9 Jan 2015 16:30:14 -0800 (PST) +Received: from s75.web-hosting.com (s75.web-hosting.com [198.187.31.9]) + (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id EB3A5431FBC + for ; Fri, 9 Jan 2015 16:30:13 -0800 (PST) +Received: from user-69-73-37-128.knology.net ([69.73.37.128]:59809 + helo=localhost.localdomain) + by server75.web-hosting.com with esmtpsa (UNKNOWN:AES128-SHA256:128) + (Exim 4.82) (envelope-from ) + id 1Y9jwS-000xx0-Re; Fri, 09 Jan 2015 19:30:13 -0500 +From: Todd +To: notmuch@notmuchmail.org +Subject: [PATCH] Index Content-Type of attachments with a contenttype prefix +Date: Fri, 9 Jan 2015 18:29:47 -0600 +Message-Id: <1420849787-4401-1-git-send-email-todd@electricoding.com> +X-Mailer: git-send-email 1.9.1 +X-AntiAbuse: This header was added to track abuse, + please include it with any abuse report +X-AntiAbuse: Primary Hostname - server75.web-hosting.com +X-AntiAbuse: Original Domain - notmuchmail.org +X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] +X-AntiAbuse: Sender Address Domain - electricoding.com +X-Get-Message-Sender-Via: server75.web-hosting.com: authenticated_id: + todd@electricoding.com +X-Source: +X-Source-Args: +X-Source-Dir: +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Sat, 10 Jan 2015 00:30:17 -0000 + +I wanted to tag messages with calendar invitations, but couldn't as +the information wasn't indexed. + +This patch allows for queries for like: + +Find calendar invites +- contenttype:text/calendar or contenttype:applicaton/ics + +Find any image attachments +- contenttype:image + +Find all patches +- contenttype:text/x-patch + + +- Todd + +--- + NEWS | 6 ++++++ + completion/notmuch-completion.bash | 2 +- + doc/man7/notmuch-search-terms.rst | 6 ++++++ + emacs/notmuch.el | 2 +- + lib/database.cc | 1 + + lib/index.cc | 5 +++++ + test/T190-multipart.sh | 32 ++++++++++++++++++++++++++++++++ + 7 files changed, 52 insertions(+), 2 deletions(-) + +diff --git a/NEWS b/NEWS +index 44e8d05..5f4622c 100644 +--- a/NEWS ++++ b/NEWS +@@ -15,6 +15,12 @@ keyboard shortcuts to saved searches. + Command-Line Interface + ---------------------- + ++There is a new `contenttype:` search prefix ++ ++ The new `contenttype:` search prefix allows searching for the ++ content-type of attachments, which is now indexed by `notmuch ++ insert`. See the `notmuch-search-terms` manual page for details. ++ + Stopped `notmuch dump` failing if someone writes to the database + + The dump command now takes the write lock when running. This +diff --git a/completion/notmuch-completion.bash b/completion/notmuch-completion.bash +index d58dc8b..05b5969 100644 +--- a/completion/notmuch-completion.bash ++++ b/completion/notmuch-completion.bash +@@ -61,7 +61,7 @@ _notmuch_search_terms() + sed "s|^$path/||" | grep -v "\(^\|/\)\(cur\|new\|tmp\)$" ) ) + ;; + *) +- local search_terms="from: to: subject: attachment: tag: id: thread: folder: path: date:" ++ local search_terms="from: to: subject: attachment: contenttype: tag: id: thread: folder: path: date:" + compopt -o nospace + COMPREPLY=( $(compgen -W "${search_terms}" -- ${cur}) ) + ;; +diff --git a/doc/man7/notmuch-search-terms.rst b/doc/man7/notmuch-search-terms.rst +index 1acdaa0..d126ce6 100644 +--- a/doc/man7/notmuch-search-terms.rst ++++ b/doc/man7/notmuch-search-terms.rst +@@ -40,6 +40,8 @@ indicate user-supplied values): + + - attachment: + ++- contenttype: ++ + - tag: (or is:) + + - id: +@@ -66,6 +68,10 @@ by including quotation marks around the phrase, immediately following + The **attachment:** prefix can be used to search for specific filenames + (or extensions) of attachments to email messages. + ++The **contenttype:** prefix can be used to search for specific ++content-types of attachments to email messages (as specified by the ++sender). ++ + For **tag:** and **is:** valid tag values include **inbox** and + **unread** by default for new messages added by **notmuch new** as well + as any other tag values added manually with **notmuch tag**. +diff --git a/emacs/notmuch.el b/emacs/notmuch.el +index 218486a..702700c 100644 +--- a/emacs/notmuch.el ++++ b/emacs/notmuch.el +@@ -858,7 +858,7 @@ PROMPT is the string to prompt with." + (lexical-let + ((completions + (append (list "folder:" "path:" "thread:" "id:" "date:" "from:" "to:" +- "subject:" "attachment:") ++ "subject:" "attachment:" "contenttype:") + (mapcar (lambda (tag) + (concat "tag:" (notmuch-escape-boolean-term tag))) + (process-lines notmuch-command "search" "--output=tags" "*"))))) +diff --git a/lib/database.cc b/lib/database.cc +index 3601f9d..a7a64c9 100644 +--- a/lib/database.cc ++++ b/lib/database.cc +@@ -254,6 +254,7 @@ static prefix_t PROBABILISTIC_PREFIX[]= { + { "from", "XFROM" }, + { "to", "XTO" }, + { "attachment", "XATTACHMENT" }, ++ { "contenttype", "XCONTENTTYPE"}, + { "subject", "XSUBJECT"}, + }; + +diff --git a/lib/index.cc b/lib/index.cc +index 1a2e63d..c3f7c6b 100644 +--- a/lib/index.cc ++++ b/lib/index.cc +@@ -346,6 +346,11 @@ _index_mime_part (notmuch_message_t *message, + return; + } + ++ GMimeContentType* content_type = g_mime_object_get_content_type(part); ++ if (content_type) { ++ _notmuch_message_gen_terms (message, "contenttype", g_mime_content_type_to_string(content_type)); ++ } ++ + if (GMIME_IS_MESSAGE_PART (part)) { + GMimeMessage *mime_message; + +diff --git a/test/T190-multipart.sh b/test/T190-multipart.sh +index 85cbf67..e3270a7 100755 +--- a/test/T190-multipart.sh ++++ b/test/T190-multipart.sh +@@ -104,6 +104,30 @@ Content-Transfer-Encoding: base64 + 7w0K + --==-=-=-- + EOF ++ ++cat < content_types ++From: Todd ++To: todd@electricoding.com ++Subject: odd content types ++Date: Fri, 05 Jan 2001 15:42:57 +0000 ++User-Agent: Notmuch/0.5 (http://notmuchmail.org) Emacs/23.3.1 (i486-pc-linux-gnu) ++Message-ID: <87liy5ap01.fsf@yoom.home.cworth.org> ++MIME-Version: 1.0 ++Content-Type: multipart/alternative; boundary="==-=-==" ++ ++--==-=-== ++Content-Type: application/unique_identifier ++ ++

This is an embedded message, with a multipart/alternative part.

++ ++--==-=-== ++Content-Type: text/some_other_identifier ++ ++This is an embedded message, with a multipart/alternative part. ++ ++--==-=-==-- ++EOF ++cat content_types >> ${MAIL_DIR}/odd_content_type + notmuch new > /dev/null + + test_begin_subtest "--format=text --part=0, full message" +@@ -727,4 +751,12 @@ test_begin_subtest "html parts included" + notmuch show --format=json --include-html id:htmlmessage > OUTPUT + test_expect_equal_json "$(cat OUTPUT)" "$(cat EXPECTED.withhtml)" + ++test_begin_subtest "indexes content-type" ++output=$(notmuch search contenttype:application/unique_identifier | notmuch_search_sanitize) ++test_expect_equal "$output" "thread:XXX 2001-01-05 [1/1] Todd; odd content types (inbox unread)" ++ ++output=$(notmuch search contenttype:text/some_other_identifier | notmuch_search_sanitize) ++test_expect_equal "$output" "thread:XXX 2001-01-05 [1/1] Todd; odd content types (inbox unread)" ++ ++ + test_done +-- +1.9.1