[RFC PATCH v3 03/11] cli: add --thread= option to notmuch-show

[Mark Walters]

The possible values are --thread=none|entire|match.

`entire' is exactly the existing option --entire-thread.

`match' is exactly the existing case when --entire-thread is not specified.

`none' is a new option to return just the matching messages with no
threading information at all.

The `none' option is used by notmuch-pick.el to display an unthreaded
message view (e.g., for an inbox). It is also useful for displaying a
single message in the notmuch-pick view as show/emacs is much faster at
showing a single message than the whole thread.

The default remains as before: `match' in all cases except when
--format=json is specified when `entire' is used.
---
 notmuch-client.h |    8 ++++++-
 notmuch-show.c   |   60 +++++++++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 64 insertions(+), 4 deletions(-)

diff --git a/notmuch-client.h b/notmuch-client.h
index 0da2d8d..b4dc7bf 100644
--- a/notmuch-client.h
+++ b/notmuch-client.h
@@ -97,8 +97,14 @@ typedef struct notmuch_show_format {
     const char *message_set_end;
 } notmuch_show_format_t;
 
+enum {
+    NOTMUCH_SHOW_THREAD_MATCH,
+    NOTMUCH_SHOW_THREAD_ENTIRE,
+    NOTMUCH_SHOW_THREAD_NONE
+};
+
 typedef struct notmuch_show_params {
-    notmuch_bool_t entire_thread;
+    int entire_thread;
     notmuch_bool_t raw;
     int part;
     int headers_only;
diff --git a/notmuch-show.c b/notmuch-show.c
index 8f6e520..3f8618b 100644
--- a/notmuch-show.c
+++ b/notmuch-show.c
@@ -893,13 +893,56 @@ show_messages (void *ctx,
 		       notmuch_message_get_replies (message),
 		       next_indent,
 		       params);
+	notmuch_message_destroy (message);
+
+	fputs (format->message_set_end, stdout);
+    }
+
+    fputs (format->message_set_end, stdout);
+}
+
+static int
+do_show_messages (void *ctx,
+		  notmuch_query_t *query,
+		  const notmuch_show_format_t *format,
+		  notmuch_show_params_t *params)
+{
+    notmuch_messages_t *messages;
+    notmuch_message_t *message;
+    int first_set = 1;
+
+    fputs (format->message_set_start, stdout);
+    messages = notmuch_query_search_messages (query);
+
+    for (;
+	 notmuch_messages_valid (messages);
+	 notmuch_messages_move_to_next (messages))
+    {
+	if (!first_set)
+	    fputs (format->message_set_sep, stdout);
+	first_set = 0;
+
+	fputs (format->message_set_start, stdout);
+	fputs (format->message_set_start, stdout);
+
+	message = notmuch_messages_get (messages);
+	notmuch_message_set_flag (message, NOTMUCH_MESSAGE_FLAG_MATCH, 1);
+	show_message (ctx, format, message, 0, params);
+
+	fputs (format->message_set_sep, stdout);
+
+	fputs (format->message_set_start, stdout);
+	fputs (format->message_set_end, stdout);
+
 
 	notmuch_message_destroy (message);
 
 	fputs (format->message_set_end, stdout);
+	fputs (format->message_set_end, stdout);
     }
 
     fputs (format->message_set_end, stdout);
+    return 0;
 }
 
 /* Formatted output of single message */
@@ -1030,6 +1073,7 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))
     notmuch_query_t *query;
     char *query_string;
     int opt_index, ret;
+    int entire_thread = NOTMUCH_SHOW_THREAD_MATCH;
     notmuch_sort_t sort = NOTMUCH_SORT_NEWEST_FIRST;
     const notmuch_show_format_t *format = &format_text;
     notmuch_show_params_t params = { .part = -1 };
@@ -1049,7 +1093,11 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))
 				  { "newest-first", NOTMUCH_SORT_NEWEST_FIRST },
 				  { 0, 0 } } },
 	{ NOTMUCH_OPT_INT, &params.part, "part", 'p', 0 },
-	{ NOTMUCH_OPT_BOOLEAN, &params.entire_thread, "entire-thread", 't', 0 },
+	{ NOTMUCH_OPT_KEYWORD, &entire_thread, "thread", 't',
+	  (notmuch_keyword_t []){ { "match", NOTMUCH_SHOW_THREAD_MATCH, },
+				  { "entire", NOTMUCH_SHOW_THREAD_ENTIRE },
+				  { "none", NOTMUCH_SHOW_THREAD_NONE },
+				  { 0, 0 } } },
 	{ NOTMUCH_OPT_BOOLEAN, &params.decrypt, "decrypt", 'd', 0 },
 	{ NOTMUCH_OPT_BOOLEAN, &verify, "verify", 'v', 0 },
 	{ NOTMUCH_OPT_BOOLEAN, &headers_only, "headers-only", 'h', 0 },
@@ -1062,6 +1110,7 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))
 	return 1;
     }
 
+    params.entire_thread = entire_thread;
     params.headers_only = headers_only;
 
     if (format_sel == NOTMUCH_FORMAT_NOT_SPECIFIED) {
@@ -1075,7 +1124,9 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))
     switch (format_sel) {
     case NOTMUCH_FORMAT_JSON:
 	format = &format_json;
-	params.entire_thread = TRUE;
+	/* This may not still be wanted */
+	if (params.entire_thread == NOTMUCH_SHOW_THREAD_MATCH)
+	    params.entire_thread = NOTMUCH_SHOW_THREAD_ENTIRE;
 	break;
     case NOTMUCH_FORMAT_TEXT:
 	format = &format_text;
@@ -1147,7 +1198,10 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))
     if (params.part >= 0)
 	ret = do_show_single (ctx, query, format, &params);
     else
-	ret = do_show (ctx, query, format, &params);
+	if (params.entire_thread == NOTMUCH_SHOW_THREAD_NONE)
+	    ret = do_show_messages (ctx, query, format, &params);
+	else
+	    ret = do_show (ctx, query, format, &params);
 
     notmuch_query_destroy (query);
     notmuch_database_close (notmuch);
-- 
1.7.2.3