[notmuch] [PATCH] notmuch-show: add option to limit display to only matching messages

[Bart Trojanowski]

This patch adds support for notmuch show --only-matching-messages
which limits the output to only the top level messages matching
the search terms provides.

Example:

$ notmuch search subject:git AND thread:23d99d0f364f93e90e15df8b42eddb5b
thread:23d99d0f364f93e90e15df8b42eddb5b      July 31 [4/12] Johan Herland; [RFCv2 00/12] Foreign VCS helper program for CVS repositories (inbox unread)

Note that in this thread 4 out of 12 messages matched.  The default show
behaviour is to show all messages in the thread:

$ notmuch show subject:git AND thread:23d99d0f364f93e90e15df8b42eddb5b | grep 'message{' | wc -l
12

With the --only-matching-messages option the output is limited to the
matching messages only:

$ notmuch show --only-matching-messages subject:git AND thread:23d99d0f364f93e90e15df8b42eddb5b | grep 'message{' | wc -l
4

Signed-off-by: Bart Trojanowski <bart at jukie.net>
---
 notmuch-show.c |   48 +++++++++++++++++++++++++++++++++++++-----------
 notmuch.c      |    7 +++++++
 2 files changed, 44 insertions(+), 11 deletions(-)

diff --git a/notmuch-show.c b/notmuch-show.c
index edebaca..8599c6c 100644
--- a/notmuch-show.c
+++ b/notmuch-show.c
@@ -211,6 +211,24 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))
     notmuch_thread_t *thread;
     notmuch_messages_t *messages;
     char *query_string;
+    int only_matching = 0;
+    int i;
+
+    for (i = 0; i < argc && argv[i][0] == '-'; i++) {
+	if (strcmp (argv[i], "--") == 0) {
+	    i++;
+	    break;
+	}
+        if (strcmp(argv[i], "--only-matching-messages") == 0) {
+	    only_matching = 1;
+	} else {
+	    fprintf (stderr, "Unrecognized option: %s\n", argv[i]);
+	    return 1;
+	}
+    }
+
+    argc -= i;
+    argv += i;
 
     config = notmuch_config_open (ctx, NULL, NULL);
     if (config == NULL)
@@ -238,21 +256,29 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))
 	return 1;
     }
 
-    for (threads = notmuch_query_search_threads (query);
-	 notmuch_threads_has_more (threads);
-	 notmuch_threads_advance (threads))
-    {
-	thread = notmuch_threads_get (threads);
+    if (only_matching) {
+	messages = notmuch_query_search_messages (query);
+	if (messages == NULL)
+	    INTERNAL_ERROR ("No messages.\n");
+	show_messages (ctx, messages, 0);
 
-	messages = notmuch_thread_get_toplevel_messages (thread);
+    } else {
+	for (threads = notmuch_query_search_threads (query);
+		notmuch_threads_has_more (threads);
+		notmuch_threads_advance (threads))
+	{
+	    thread = notmuch_threads_get (threads);
 
-	if (messages == NULL)
-	    INTERNAL_ERROR ("Thread %s has no toplevel messages.\n",
-			    notmuch_thread_get_thread_id (thread));
+	    messages = notmuch_thread_get_toplevel_messages (thread);
 
-	show_messages (ctx, messages, 0);
+	    if (messages == NULL)
+		INTERNAL_ERROR ("Thread %s has no toplevel messages.\n",
+			notmuch_thread_get_thread_id (thread));
+
+	    show_messages (ctx, messages, 0);
 
-	notmuch_thread_destroy (thread);
+	    notmuch_thread_destroy (thread);
+	}
     }
 
     notmuch_query_destroy (query);
diff --git a/notmuch.c b/notmuch.c
index f45b692..a817ae3 100644
--- a/notmuch.c
+++ b/notmuch.c
@@ -177,6 +177,13 @@ command_t commands[] = {
       "\t\t(all replies to a particular message appear immediately\n"
       "\t\tafter that message in date order).\n"
       "\n"
+      "\t\tSupported options for show include:\n"
+      "\n"
+      "\t\t--only-matching-messages\n"
+      "\n"
+      "\t\t\tUsing this option will prevent output of any messages\n"
+      "\t\t\tthat do not match the search terms.\n"
+      "\n"
       "\t\tThe output format is plain-text, with all text-content\n"
       "\t\tMIME parts decoded. Various components in the output,\n"
       "\t\t('message', 'header', 'body', 'attachment', and MIME 'part')\n"
-- 
1.6.4.4.2.gc2f148