X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=show-message.c;h=8768889efddd11ed665e84f788bf0864bd6da3c3;hp=38f5897aac75ca6cf6673e982d5fab41d90ea70d;hb=d61cef374b3234c2f1327fa74b612b40c196a605;hpb=2ce25b93a72b4a8d6daa5321f9ef7df0772a789f

diff --git a/show-message.c b/show-message.c
index 38f5897a..8768889e 100644
--- a/show-message.c
+++ b/show-message.c
@@ -22,90 +22,81 @@
 
 #include "notmuch-client.h"
 
+typedef struct show_message_state {
+    int part_count;
+} show_message_state_t;
+
 static void
-show_message_part (GMimeObject *part, int *part_count,
-		   void (*show_part) (GMimeObject *part, int *part_count))
+show_message_part (mime_node_t *node,
+		   show_message_state_t *state,
+		   const notmuch_show_format_t *format,
+		   int first)
 {
-    *part_count = *part_count + 1;
-
-    if (GMIME_IS_MULTIPART (part)) {
-	GMimeMultipart *multipart = GMIME_MULTIPART (part);
-	int i;
-
-	for (i = 0; i < g_mime_multipart_get_count (multipart); i++) {
-	    if (GMIME_IS_MULTIPART_SIGNED (multipart)) {
-		/* Don't index the signature. */
-		if (i == 1)
-		    continue;
-		if (i > 1)
-		    fprintf (stderr, "Warning: Unexpected extra parts of multipart/signed. Continuing.\n");
-	    }
-	    show_message_part (g_mime_multipart_get_part (multipart, i),
-			       part_count, show_part);
-	}
-	return;
-    }
+    /* Formatters expect the envelope for embedded message parts */
+    GMimeObject *part = node->envelope_part ?
+	GMIME_OBJECT (node->envelope_part) : node->part;
+    int i;
 
-    if (GMIME_IS_MESSAGE_PART (part)) {
-	GMimeMessage *mime_message;
+    if (!first)
+	fputs (format->part_sep, stdout);
 
-	mime_message = g_mime_message_part_get_message (GMIME_MESSAGE_PART (part));
+    /* Format this part */
+    if (format->part_start)
+	format->part_start (part, &(state->part_count));
 
-	show_message_part (g_mime_message_get_mime_part (mime_message),
-			   part_count, show_part);
+    if (node->decrypt_attempted && format->part_encstatus)
+	format->part_encstatus (node->decrypt_success);
 
-	return;
-    }
+    if (node->verify_attempted && format->part_sigstatus)
+	format->part_sigstatus (node->sig_validity);
 
-    if (! (GMIME_IS_PART (part))) {
-	fprintf (stderr, "Warning: Not displaying unknown mime part: %s.\n",
-		 g_type_name (G_OBJECT_TYPE (part)));
-	return;
-    }
+    format->part_content (part);
 
-    (*show_part) (part, part_count);
-}
+    if (node->envelope_part) {
+	fputs (format->header_start, stdout);
+	if (format->header_message_part)
+	    format->header_message_part (GMIME_MESSAGE (node->part));
+	fputs (format->header_end, stdout);
 
-notmuch_status_t
-show_message_body (const char *filename,
-		   void (*show_part) (GMimeObject *part, int *part_count))
-{
-    GMimeStream *stream = NULL;
-    GMimeParser *parser = NULL;
-    GMimeMessage *mime_message = NULL;
-    notmuch_status_t ret = NOTMUCH_STATUS_SUCCESS;
-    FILE *file = NULL;
-    int part_count = 0;
-
-    file = fopen (filename, "r");
-    if (! file) {
-	fprintf (stderr, "Error opening %s: %s\n", filename, strerror (errno));
-	ret = NOTMUCH_STATUS_FILE_ERROR;
-	goto DONE;
+	fputs (format->body_start, stdout);
     }
 
-    stream = g_mime_stream_file_new (file);
-    g_mime_stream_file_set_owner (GMIME_STREAM_FILE (stream), FALSE);
+    /* Recurse over the children */
+    state->part_count += 1;
+    for (i = 0; i < node->nchildren; i++)
+	show_message_part (mime_node_child (node, i), state, format, i == 0);
 
-    parser = g_mime_parser_new_with_stream (stream);
+    /* Finish this part */
+    if (node->envelope_part)
+	fputs (format->body_end, stdout);
 
-    mime_message = g_mime_parser_construct_message (parser);
+    if (format->part_end)
+	format->part_end (part);
+}
 
-    show_message_part (g_mime_message_get_mime_part (mime_message),
-		       &part_count, show_part);
+notmuch_status_t
+show_message_body (notmuch_message_t *message,
+		   const notmuch_show_format_t *format,
+		   notmuch_show_params_t *params)
+{
+    notmuch_status_t ret;
+    show_message_state_t state;
+    mime_node_t *root, *part;
 
-  DONE:
-    if (mime_message)
-	g_object_unref (mime_message);
+    ret = mime_node_open (NULL, message, params->cryptoctx, params->decrypt,
+			  &root);
+    if (ret)
+	return ret;
 
-    if (parser)
-	g_object_unref (parser);
+    /* The caller of show_message_body has already handled the
+     * outermost envelope, so skip it. */
+    state.part_count = MAX (params->part, 1);
 
-    if (stream)
-	g_object_unref (stream);
+    part = mime_node_seek_dfs (root, state.part_count);
+    if (part)
+	show_message_part (part, &state, format, TRUE);
 
-    if (file)
-	fclose (file);
+    talloc_free (root);
 
-    return ret;
+    return NOTMUCH_STATUS_SUCCESS;
 }