X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=show-message.c;h=8768889efddd11ed665e84f788bf0864bd6da3c3;hp=32bb860f63dd8c86d54389d3d4333fde46956386;hb=baa2c9721d850ea95857f44ba0b44147c80f7998;hpb=2f8871df6ea3c0b44f85a0fc1b4f58a6b70b0a0e

diff --git a/show-message.c b/show-message.c
index 32bb860f..8768889e 100644
--- a/show-message.c
+++ b/show-message.c
@@ -24,115 +24,79 @@
 
 typedef struct show_message_state {
     int part_count;
-    int in_zone;
 } show_message_state_t;
 
 static void
-show_message_part (GMimeObject *part,
+show_message_part (mime_node_t *node,
 		   show_message_state_t *state,
 		   const notmuch_show_format_t *format,
-		   notmuch_show_params_t *params,
 		   int first)
 {
-    int selected;
-    state->part_count += 1;
-
-    if (! (GMIME_IS_PART (part) || GMIME_IS_MULTIPART (part) || GMIME_IS_MESSAGE_PART (part))) {
-	fprintf (stderr, "Warning: Not displaying unknown mime part: %s.\n",
-		 g_type_name (G_OBJECT_TYPE (part)));
-	return;
-    }
+    /* Formatters expect the envelope for embedded message parts */
+    GMimeObject *part = node->envelope_part ?
+	GMIME_OBJECT (node->envelope_part) : node->part;
+    int i;
 
-    selected = (params->part <= 0 || state->part_count == params->part);
+    if (!first)
+	fputs (format->part_sep, stdout);
 
-    if (selected || state->in_zone) {
-	if (!first && (params->part <= 0 || state->in_zone))
-	    fputs (format->part_sep, stdout);
-
-	format->part (part, &(state->part_count));
-    }
+    /* Format this part */
+    if (format->part_start)
+	format->part_start (part, &(state->part_count));
 
-    if (GMIME_IS_MULTIPART (part)) {
-	GMimeMultipart *multipart = GMIME_MULTIPART (part);
-	int i;
+    if (node->decrypt_attempted && format->part_encstatus)
+	format->part_encstatus (node->decrypt_success);
 
-	if (selected)
-	    state->in_zone = 1;
+    if (node->verify_attempted && format->part_sigstatus)
+	format->part_sigstatus (node->sig_validity);
 
-	for (i = 0; i < g_mime_multipart_get_count (multipart); i++) {
-	    show_message_part (g_mime_multipart_get_part (multipart, i),
-			       state, format, params, i == 0);
-	}
+    format->part_content (part);
 
-	if (selected)
-	    state->in_zone = 0;
+    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);
 
-    } else if (GMIME_IS_MESSAGE_PART (part)) {
-	GMimeMessage *mime_message = g_mime_message_part_get_message (GMIME_MESSAGE_PART (part));
-
-	if (selected)
-	    state->in_zone = 1;
+	fputs (format->body_start, stdout);
+    }
 
-	show_message_part (g_mime_message_get_mime_part (mime_message),
-			   state, format, params, TRUE);
+    /* 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);
 
-	if (selected)
-	    state->in_zone = 0;
-    }
+    /* Finish this part */
+    if (node->envelope_part)
+	fputs (format->body_end, stdout);
 
-    if (selected || state->in_zone) {
-	if (format->part_end)
-	    format->part_end (part);
-    }
+    if (format->part_end)
+	format->part_end (part);
 }
 
 notmuch_status_t
-show_message_body (const char *filename,
+show_message_body (notmuch_message_t *message,
 		   const notmuch_show_format_t *format,
 		   notmuch_show_params_t *params)
 {
-    GMimeStream *stream = NULL;
-    GMimeParser *parser = NULL;
-    GMimeMessage *mime_message = NULL;
-    notmuch_status_t ret = NOTMUCH_STATUS_SUCCESS;
-    FILE *file = NULL;
+    notmuch_status_t ret;
     show_message_state_t state;
+    mime_node_t *root, *part;
 
-    state.part_count = 0;
-    state.in_zone = 0;
-
-    file = fopen (filename, "r");
-    if (! file) {
-	fprintf (stderr, "Error opening %s: %s\n", filename, strerror (errno));
-	ret = NOTMUCH_STATUS_FILE_ERROR;
-	goto DONE;
-    }
-
-    stream = g_mime_stream_file_new (file);
-    g_mime_stream_file_set_owner (GMIME_STREAM_FILE (stream), FALSE);
-
-    parser = g_mime_parser_new_with_stream (stream);
-
-    mime_message = g_mime_parser_construct_message (parser);
-
-    show_message_part (g_mime_message_get_mime_part (mime_message),
-		       &state,
-		       format,
-		       params,
-		       TRUE);
-
-  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;
 }