X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-show.c;h=20e54bcd0f0a6d665720dbc6354d2824ebdcfe09;hp=ef421ec7cc382ea6e3dbe188c50d1140423b6f30;hb=04927208fa10cfa33d2ca93dfcb5ac95f25f55a1;hpb=44ea57a0d10ddab514abea319c4d25ec4e36b51e

diff --git a/notmuch-show.c b/notmuch-show.c
index ef421ec7..20e54bcd 100644
--- a/notmuch-show.c
+++ b/notmuch-show.c
@@ -20,25 +20,6 @@
 
 #include "notmuch-client.h"
 
-typedef struct show_format {
-    const char *message_set_start;
-    const char *message_start;
-    void (*message) (const void *ctx,
-		     notmuch_message_t *message,
-		     int indent);
-    const char *header_start;
-    void (*header) (const void *ctx,
-		    notmuch_message_t *message);
-    const char *header_end;
-    const char *body_start;
-    void (*part) (GMimeObject *part,
-		  int *part_count);
-    const char *body_end;
-    const char *message_end;
-    const char *message_set_sep;
-    const char *message_set_end;
-} show_format_t;
-
 static void
 format_message_text (unused (const void *ctx),
 		     notmuch_message_t *message,
@@ -46,14 +27,20 @@ format_message_text (unused (const void *ctx),
 static void
 format_headers_text (const void *ctx,
 		     notmuch_message_t *message);
+
 static void
 format_part_text (GMimeObject *part,
-		  int *part_count);
-static const show_format_t format_text = {
+		  int *part_count,
+		  int first);
+
+static void
+format_part_end_text (GMimeObject *part);
+
+static const notmuch_show_format_t format_text = {
     "",
 	"\fmessage{ ", format_message_text,
 	    "\fheader{\n", format_headers_text, "\fheader}\n",
-	    "\fbody{\n", format_part_text, "\fbody}\n",
+	    "\fbody{\n", format_part_text, format_part_end_text, "\fbody}\n",
 	"\fmessage}\n", "",
     ""
 };
@@ -65,14 +52,20 @@ format_message_json (const void *ctx,
 static void
 format_headers_json (const void *ctx,
 		     notmuch_message_t *message);
+
 static void
 format_part_json (GMimeObject *part,
-		  int *part_count);
-static const show_format_t format_json = {
+		  int *part_count,
+		  int first);
+
+static void
+format_part_end_json (GMimeObject *part);
+
+static const notmuch_show_format_t format_json = {
     "[",
 	"{", format_message_json,
 	    ", \"headers\": {", format_headers_json, "}",
-	    ", \"body\": [", format_part_json, "]",
+	    ", \"body\": [", format_part_json, format_part_end_json, "]",
 	"}", ", ",
     "]"
 };
@@ -82,11 +75,11 @@ format_message_mbox (const void *ctx,
 		     notmuch_message_t *message,
 		     unused (int indent));
 
-static const show_format_t format_mbox = {
+static const notmuch_show_format_t format_mbox = {
     "",
         "", format_message_mbox,
             "", NULL, "",
-            "", NULL, "",
+	    "", NULL, NULL, "",
         "", "",
     ""
 };
@@ -364,7 +357,7 @@ show_part_content (GMimeObject *part, GMimeStream *stream_out)
 }
 
 static void
-format_part_text (GMimeObject *part, int *part_count)
+format_part_text (GMimeObject *part, int *part_count, unused (int first))
 {
     GMimeContentDisposition *disposition;
     GMimeContentType *content_type;
@@ -391,8 +384,6 @@ format_part_text (GMimeObject *part, int *part_count)
 	    g_object_unref(stream_stdout);
 	}
 
-	printf ("\fattachment}\n");
-
 	return;
     }
 
@@ -410,33 +401,59 @@ format_part_text (GMimeObject *part, int *part_count)
 	show_part_content (part, stream_stdout);
 	g_object_unref(stream_stdout);
     }
+    else if (g_mime_content_type_is_type (content_type, "multipart", "*"))
+    {
+	/* Do nothing for multipart since its content will be printed
+	 * when recursing. */
+    }
     else
     {
 	printf ("Non-text part: %s\n",
 		g_mime_content_type_to_string (content_type));
     }
+}
 
-    printf ("\fpart}\n");
+static void
+format_part_end_text (GMimeObject *part)
+{
+    GMimeContentDisposition *disposition;
+
+    disposition = g_mime_object_get_content_disposition (part);
+    if (disposition &&
+	strcmp (disposition->disposition, GMIME_DISPOSITION_ATTACHMENT) == 0)
+    {
+	printf ("\fattachment}\n");
+    }
+    else
+    {
+	printf ("\fpart}\n");
+    }
 }
 
 static void
-format_part_json (GMimeObject *part, int *part_count)
+format_part_json (GMimeObject *part, int *part_count, int first)
 {
     GMimeContentType *content_type;
     GMimeContentDisposition *disposition;
     void *ctx = talloc_new (NULL);
     GMimeStream *stream_memory = g_mime_stream_mem_new ();
     GByteArray *part_content;
+    const char *cid;
 
     content_type = g_mime_object_get_content_type (GMIME_OBJECT (part));
 
-    if (*part_count > 1)
+    if (! first)
 	fputs (", ", stdout);
 
     printf ("{\"id\": %d, \"content-type\": %s",
 	    *part_count,
 	    json_quote_str (ctx, g_mime_content_type_to_string (content_type)));
 
+    cid = g_mime_object_get_content_id (part);
+    if (cid != NULL)
+	    printf(", \"content-id\": %s",
+		   json_quote_str (ctx, cid));
+
     disposition = g_mime_object_get_content_disposition (part);
     if (disposition &&
 	strcmp (disposition->disposition, GMIME_DISPOSITION_ATTACHMENT) == 0)
@@ -454,8 +471,10 @@ format_part_json (GMimeObject *part, int *part_count)
 
 	printf (", \"content\": %s", json_quote_chararray (ctx, (char *) part_content->data, part_content->len));
     }
-
-    fputs ("}", stdout);
+    else if (g_mime_content_type_is_type (content_type, "multipart", "*"))
+    {
+	printf (", \"content\": [");
+    }
 
     talloc_free (ctx);
     if (stream_memory)
@@ -463,7 +482,23 @@ format_part_json (GMimeObject *part, int *part_count)
 }
 
 static void
-show_message (void *ctx, const show_format_t *format, notmuch_message_t *message, int indent)
+format_part_end_json (GMimeObject *part)
+{
+    GMimeContentType *content_type;
+
+    content_type = g_mime_object_get_content_type (GMIME_OBJECT (part));
+
+    if (g_mime_content_type_is_type (content_type, "multipart", "*"))
+	printf ("]");
+
+    printf ("}");
+}
+
+static void
+show_message (void *ctx,
+	      const notmuch_show_format_t *format,
+	      notmuch_message_t *message,
+	      int indent)
 {
     fputs (format->message_start, stdout);
     if (format->message)
@@ -476,7 +511,8 @@ show_message (void *ctx, const show_format_t *format, notmuch_message_t *message
 
     fputs (format->body_start, stdout);
     if (format->part)
-	show_message_body (notmuch_message_get_filename (message), format->part);
+	show_message_body (notmuch_message_get_filename (message),
+			   format);
     fputs (format->body_end, stdout);
 
     fputs (format->message_end, stdout);
@@ -484,7 +520,10 @@ show_message (void *ctx, const show_format_t *format, notmuch_message_t *message
 
 
 static void
-show_messages (void *ctx, const show_format_t *format, notmuch_messages_t *messages, int indent,
+show_messages (void *ctx,
+	       const notmuch_show_format_t *format,
+	       notmuch_messages_t *messages,
+	       int indent,
 	       notmuch_bool_t entire_thread)
 {
     notmuch_message_t *message;
@@ -578,7 +617,7 @@ do_show_raw (unused(void *ctx), notmuch_query_t *query)
 static int
 do_show (void *ctx,
 	 notmuch_query_t *query,
-	 const show_format_t *format,
+	 const notmuch_show_format_t *format,
 	 int entire_thread)
 {
     notmuch_threads_t *threads;
@@ -623,7 +662,7 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))
     notmuch_query_t *query;
     char *query_string;
     char *opt;
-    const show_format_t *format = &format_text;
+    const notmuch_show_format_t *format = &format_text;
     int entire_thread = 0;
     int i;
     int raw = 0;