New part output handling as option to notmuch-show.

Outputting of single MIME parts is moved to an option of notmuch show,
instead of being handled in it's own sub-command.  The recent rework
of multipart mime allowed for this change but consolidating part
handling into a single recursive function (show_message_part) that
includes formatting.  This allows for far simpler handling single
output of a single part, including formatting.

1 files changed, 42 insertions, 108 deletions

diff --git a/show-message.c b/show-message.c
index 4ccd4490..32bb860f 100644
--- a/show-message.c
+++ b/show-message.c
@@ -22,13 +22,20 @@
 
 #include "notmuch-client.h"
 
+typedef struct show_message_state {
+    int part_count;
+    int in_zone;
+} show_message_state_t;
+
 static void
 show_message_part (GMimeObject *part,
-		   int *part_count,
+		   show_message_state_t *state,
 		   const notmuch_show_format_t *format,
+		   notmuch_show_params_t *params,
 		   int first)
 {
-    *part_count += 1;
+    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",
@@ -36,43 +43,63 @@ show_message_part (GMimeObject *part,
 	return;
     }
 
-    if (!first)
-	fputs (format->part_sep, stdout);
+    selected = (params->part <= 0 || state->part_count == params->part);
+
+    if (selected || state->in_zone) {
+	if (!first && (params->part <= 0 || state->in_zone))
+	    fputs (format->part_sep, stdout);
 
-    format->part (part, part_count);
+	format->part (part, &(state->part_count));
+    }
 
     if (GMIME_IS_MULTIPART (part)) {
 	GMimeMultipart *multipart = GMIME_MULTIPART (part);
 	int i;
 
+	if (selected)
+	    state->in_zone = 1;
+
 	for (i = 0; i < g_mime_multipart_get_count (multipart); i++) {
 	    show_message_part (g_mime_multipart_get_part (multipart, i),
-			       part_count, format, i == 0);
+			       state, format, params, i == 0);
 	}
 
+	if (selected)
+	    state->in_zone = 0;
+
     } else if (GMIME_IS_MESSAGE_PART (part)) {
-	GMimeMessage *mime_message;
+	GMimeMessage *mime_message = g_mime_message_part_get_message (GMIME_MESSAGE_PART (part));
 
-	mime_message = g_mime_message_part_get_message (GMIME_MESSAGE_PART (part));
+	if (selected)
+	    state->in_zone = 1;
 
 	show_message_part (g_mime_message_get_mime_part (mime_message),
-			   part_count, format, first);
+			   state, format, params, TRUE);
+
+	if (selected)
+	    state->in_zone = 0;
     }
 
-    if (format->part_end)
-	format->part_end (part);
+    if (selected || state->in_zone) {
+	if (format->part_end)
+	    format->part_end (part);
+    }
 }
 
 notmuch_status_t
 show_message_body (const char *filename,
-		   const notmuch_show_format_t *format)
+		   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;
-    int part_count = 0;
+    show_message_state_t state;
+
+    state.part_count = 0;
+    state.in_zone = 0;
 
     file = fopen (filename, "r");
     if (! file) {
@@ -89,8 +116,9 @@ show_message_body (const char *filename,
     mime_message = g_mime_parser_construct_message (parser);
 
     show_message_part (g_mime_message_get_mime_part (mime_message),
-		       &part_count,
+		       &state,
 		       format,
+		       params,
 		       TRUE);
 
   DONE:
@@ -108,97 +136,3 @@ show_message_body (const char *filename,
 
     return ret;
 }
-
-static void
-show_one_part_output (GMimeObject *part)
-{
-    GMimeStream *stream_filter = NULL;
-    GMimeDataWrapper *wrapper;
-    GMimeStream *stream_stdout = g_mime_stream_file_new (stdout);
-
-    stream_filter = g_mime_stream_filter_new(stream_stdout);
-    wrapper = g_mime_part_get_content_object (GMIME_PART (part));
-    if (wrapper && stream_filter)
-	g_mime_data_wrapper_write_to_stream (wrapper, stream_filter);
-    if (stream_filter)
-	g_object_unref(stream_filter);
-}
-
-static void
-show_one_part_worker (GMimeObject *part, int *part_count, int desired_part)
-{
-    if (GMIME_IS_MULTIPART (part)) {
-	GMimeMultipart *multipart = GMIME_MULTIPART (part);
-	int i;
-
-	*part_count = *part_count + 1;
-
-	for (i = 0; i < g_mime_multipart_get_count (multipart); i++) {
-		show_one_part_worker (g_mime_multipart_get_part (multipart, i),
-				      part_count, desired_part);
-	}
-	return;
-    }
-
-    if (GMIME_IS_MESSAGE_PART (part)) {
-	GMimeMessage *mime_message;
-
-	mime_message = g_mime_message_part_get_message (GMIME_MESSAGE_PART (part));
-
-	show_one_part_worker (g_mime_message_get_mime_part (mime_message),
-			      part_count, desired_part);
-
-	return;
-    }
-
-    if (! (GMIME_IS_PART (part)))
-	return;
-
-    *part_count = *part_count + 1;
-
-    if (*part_count == desired_part)
-	    show_one_part_output (part);
-}
-
-notmuch_status_t
-show_one_part (const char *filename, int part)
-{
-	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;
-	}
-
-	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_one_part_worker (g_mime_message_get_mime_part (mime_message),
-			      &part_count, part);
-
- DONE:
-	if (mime_message)
-		g_object_unref (mime_message);
-
-	if (parser)
-		g_object_unref (parser);
-
-	if (stream)
-		g_object_unref (stream);
-
-	if (file)
-		fclose (file);
-
-	return ret;
-}