notmuch show: limit display to only matching messages

[notmuch] / notmuch-show.c

diff --git a/notmuch-show.c b/notmuch-show.c
index edebacaa571a3ba44a089fa671300e71f8c530cb..60339d088642323f8a15a581803c3fcbc2a714a3 100644 (file)
--- a/notmuch-show.c
+++ b/notmuch-show.c
@@ -155,9 +155,10 @@ show_message (void *ctx, notmuch_message_t *message, int indent)
     const char *name, *value;
     unsigned int i;
 
-    printf ("\fmessage{ id:%s depth:%d filename:%s\n",
+    printf ("\fmessage{ id:%s depth:%d match:%d filename:%s\n",
            notmuch_message_get_message_id (message),
            indent,
+           notmuch_message_get_flag (message, NOTMUCH_MESSAGE_FLAG_MATCH),
            notmuch_message_get_filename (message));
 
     printf ("\fheader{\n");
@@ -211,6 +212,24 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))
     notmuch_thread_t *thread;
     notmuch_messages_t *messages;
     char *query_string;
+    int entire_thread = 0;
+    int i;
+
+    for (i = 0; i < argc && argv[i][0] == '-'; i++) {
+       if (strcmp (argv[i], "--") == 0) {
+           i++;
+           break;
+       }
+        if (strcmp(argv[i], "--entire-thread") == 0) {
+           entire_thread = 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 +257,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 (!entire_thread) {
+       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);