X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-show.c;h=a3f354edb6816c0b1b41038759a795b8da626db0;hp=b5db3df95aa2652be9e1f5ffa0f0d7f241894696;hb=b032cf98f55da9610b6bb971b32d79e24acb4648;hpb=357aba3ec8177c11a7ce22cbe26d92482f6a5e53

diff --git a/notmuch-show.c b/notmuch-show.c
index b5db3df9..a3f354ed 100644
--- a/notmuch-show.c
+++ b/notmuch-show.c
@@ -67,7 +67,7 @@ _get_one_line_summary (void *ctx, notmuch_message_t *message)
 }
 
 static void
-show_part(GMimeObject *part, int *part_count)
+show_part (GMimeObject *part, int *part_count)
 {
     GMimeContentDisposition *disposition;
     GMimeContentType *content_type;
@@ -117,87 +117,111 @@ show_part(GMimeObject *part, int *part_count)
     printf ("\fpart}\n");
 }
 
-int
-notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))
+static void
+show_message (void *ctx, notmuch_message_t *message, int indent)
 {
-    void *local = talloc_new (ctx);
-    char *query_string;
-    notmuch_database_t *notmuch = NULL;
-    notmuch_query_t *query = NULL;
-    notmuch_messages_t *messages;
-    notmuch_message_t *message;
-    int ret = 0;
-
     const char *headers[] = {
-	"From", "To", "Cc", "Bcc", "Date"
+	"Subject", "From", "To", "Cc", "Bcc", "Date"
     };
     const char *name, *value;
     unsigned int i;
 
-    notmuch = notmuch_database_open (NULL);
-    if (notmuch == NULL) {
-	ret = 1;
-	goto DONE;
-    }
+    printf ("\fmessage{ id:%s depth:%d filename:%s\n",
+	    notmuch_message_get_message_id (message),
+	    indent,
+	    notmuch_message_get_filename (message));
 
-    query_string = query_string_from_args (local, argc, argv);
-    if (query_string == NULL) {
-	fprintf (stderr, "Out of memory\n");
-	ret = 1;
-	goto DONE;
-    }
+    printf ("\fheader{\n");
 
-    query = notmuch_query_create (notmuch, query_string);
-    if (query == NULL) {
-	fprintf (stderr, "Out of memory\n");
-	ret = 1;
-	goto DONE;
+    printf ("%s\n", _get_one_line_summary (ctx, message));
+
+    for (i = 0; i < ARRAY_SIZE (headers); i++) {
+	name = headers[i];
+	value = notmuch_message_get_header (message, name);
+	if (value)
+	    printf ("%s: %s\n", name, value);
     }
 
-    for (messages = notmuch_query_search_messages (query);
+    printf ("\fheader}\n");
+    printf ("\fbody{\n");
+
+    show_message_body (notmuch_message_get_filename (message), show_part);
+
+    printf ("\fbody}\n");
+
+    printf ("\fmessage}\n");
+}
+
+
+static void
+show_messages (void *ctx, notmuch_messages_t *messages, int indent)
+{
+    notmuch_message_t *message;
+
+    for (;
 	 notmuch_messages_has_more (messages);
 	 notmuch_messages_advance (messages))
     {
 	message = notmuch_messages_get (messages);
 
-	printf ("\fmessage{ id:%s filename:%s\n",
-		notmuch_message_get_message_id (message),
-		notmuch_message_get_filename (message));
+	show_message (ctx, message, indent);
+
+	show_messages (ctx, notmuch_message_get_replies (message), indent + 1);
 
-	printf ("\fheader{\n");
+	notmuch_message_destroy (message);
+    }
+}
 
-	printf ("%s\n", _get_one_line_summary (local, message));
+int
+notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))
+{
+    notmuch_config_t *config;
+    notmuch_database_t *notmuch;
+    notmuch_query_t *query;
+    notmuch_threads_t *threads;
+    notmuch_thread_t *thread;
+    notmuch_messages_t *messages;
+    char *query_string;
 
-	printf ("%s\n", notmuch_message_get_header (message, "subject"));
+    config = notmuch_config_open (ctx, NULL, NULL);
+    if (config == NULL)
+	return 1;
 
-	for (i = 0; i < ARRAY_SIZE (headers); i++) {
-	    name = headers[i];
-	    value = notmuch_message_get_header (message, name);
-	    if (value)
-		printf ("%s: %s\n", name, value);
-	}
+    notmuch = notmuch_database_open (notmuch_config_get_database_path (config));
+    if (notmuch == NULL)
+	return 1;
 
-	printf ("\fheader}\n");
-	printf ("\fbody{\n");
+    query_string = query_string_from_args (ctx, argc, argv);
+    if (query_string == NULL) {
+	fprintf (stderr, "Out of memory\n");
+	return 1;
+    }
 
-	show_message_body (notmuch_message_get_filename (message), show_part);
+    query = notmuch_query_create (notmuch, query_string);
+    if (query == NULL) {
+	fprintf (stderr, "Out of memory\n");
+	return 1;
+    }
 
-	printf ("\fbody}\n");
+    for (threads = notmuch_query_search_threads (query, 0, -1);
+	 notmuch_threads_has_more (threads);
+	 notmuch_threads_advance (threads))
+    {
+	thread = notmuch_threads_get (threads);
 
-	printf ("\fmessage}\n");
+	messages = notmuch_thread_get_toplevel_messages (thread);
 
-	notmuch_message_destroy (message);
-    }
+	if (messages == NULL)
+	    INTERNAL_ERROR ("Thread %s has no toplevel messages.\n",
+			    notmuch_thread_get_thread_id (thread));
 
-  DONE:
-    if (local)
-	talloc_free (local);
+	show_messages (ctx, messages, 0);
 
-    if (query)
-	notmuch_query_destroy (query);
+	notmuch_thread_destroy (thread);
+    }
 
-    if (notmuch)
-	notmuch_database_close (notmuch);
+    notmuch_query_destroy (query);
+    notmuch_database_close (notmuch);
 
-    return ret;
+    return 0;
 }