add part_sep formatter to replace "first" argument to part format functions

[obsolete/notmuch-old] / notmuch-show.c

diff --git a/notmuch-show.c b/notmuch-show.c
index 20e54bcd0f0a6d665720dbc6354d2824ebdcfe09..412f908d4ceaa3bad06ba925e63b5c9b03988965 100644 (file)
--- a/notmuch-show.c
+++ b/notmuch-show.c
@@ -30,8 +30,7 @@ format_headers_text (const void *ctx,
 
 static void
 format_part_text (GMimeObject *part,
-                 int *part_count,
-                 int first);
+                 int *part_count);
 
 static void
 format_part_end_text (GMimeObject *part);
@@ -40,7 +39,7 @@ static const notmuch_show_format_t format_text = {
     "",
        "\fmessage{ ", format_message_text,
            "\fheader{\n", format_headers_text, "\fheader}\n",
-           "\fbody{\n", format_part_text, format_part_end_text, "\fbody}\n",
+           "\fbody{\n", format_part_text, format_part_end_text, "", "\fbody}\n",
        "\fmessage}\n", "",
     ""
 };
@@ -55,8 +54,7 @@ format_headers_json (const void *ctx,
 
 static void
 format_part_json (GMimeObject *part,
-                 int *part_count,
-                 int first);
+                 int *part_count);
 
 static void
 format_part_end_json (GMimeObject *part);
@@ -65,7 +63,7 @@ static const notmuch_show_format_t format_json = {
     "[",
        "{", format_message_json,
            ", \"headers\": {", format_headers_json, "}",
-           ", \"body\": [", format_part_json, format_part_end_json, "]",
+           ", \"body\": [", format_part_json, format_part_end_json, ", ", "]",
        "}", ", ",
     "]"
 };
@@ -79,7 +77,7 @@ static const notmuch_show_format_t format_mbox = {
     "",
         "", format_message_mbox,
             "", NULL, "",
-           "", NULL, NULL, "",
+            "", NULL, NULL, "", "",
         "", "",
     ""
 };
@@ -357,7 +355,7 @@ show_part_content (GMimeObject *part, GMimeStream *stream_out)
 }
 
 static void
-format_part_text (GMimeObject *part, int *part_count, unused (int first))
+format_part_text (GMimeObject *part, int *part_count)
 {
     GMimeContentDisposition *disposition;
     GMimeContentType *content_type;
@@ -431,7 +429,7 @@ format_part_end_text (GMimeObject *part)
 }
 
 static void
-format_part_json (GMimeObject *part, int *part_count, int first)
+format_part_json (GMimeObject *part, int *part_count)
 {
     GMimeContentType *content_type;
     GMimeContentDisposition *disposition;
@@ -442,9 +440,6 @@ format_part_json (GMimeObject *part, int *part_count, int first)
 
     content_type = g_mime_object_get_content_type (GMIME_OBJECT (part));
 
-    if (! first)
-       fputs (", ", stdout);
-
     printf ("{\"id\": %d, \"content-type\": %s",
            *part_count,
            json_quote_str (ctx, g_mime_content_type_to_string (content_type)));
@@ -524,7 +519,7 @@ show_messages (void *ctx,
               const notmuch_show_format_t *format,
               notmuch_messages_t *messages,
               int indent,
-              notmuch_bool_t entire_thread)
+              notmuch_show_params_t *params)
 {
     notmuch_message_t *message;
     notmuch_bool_t match;
@@ -549,15 +544,18 @@ show_messages (void *ctx,
 
        next_indent = indent;
 
-       if (match || entire_thread) {
+       if (match || params->entire_thread) {
            show_message (ctx, format, message, indent);
            next_indent = indent + 1;
 
            fputs (format->message_set_sep, stdout);
        }
 
-       show_messages (ctx, format, notmuch_message_get_replies (message),
-                      next_indent, entire_thread);
+       show_messages (ctx,
+                      format,
+                      notmuch_message_get_replies (message),
+                      next_indent,
+                      params);
 
        notmuch_message_destroy (message);
 
@@ -618,7 +616,7 @@ static int
 do_show (void *ctx,
         notmuch_query_t *query,
         const notmuch_show_format_t *format,
-        int entire_thread)
+        notmuch_show_params_t *params)
 {
     notmuch_threads_t *threads;
     notmuch_thread_t *thread;
@@ -643,7 +641,7 @@ do_show (void *ctx,
            fputs (format->message_set_sep, stdout);
        first_toplevel = 0;
 
-       show_messages (ctx, format, messages, 0, entire_thread);
+       show_messages (ctx, format, messages, 0, params);
 
        notmuch_thread_destroy (thread);
 
@@ -663,10 +661,12 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))
     char *query_string;
     char *opt;
     const notmuch_show_format_t *format = &format_text;
-    int entire_thread = 0;
+    notmuch_show_params_t params;
     int i;
     int raw = 0;
 
+    params.entire_thread = 0;
+
     for (i = 0; i < argc && argv[i][0] == '-'; i++) {
        if (strcmp (argv[i], "--") == 0) {
            i++;
@@ -678,7 +678,7 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))
                format = &format_text;
            } else if (strcmp (opt, "json") == 0) {
                format = &format_json;
-               entire_thread = 1;
+               params.entire_thread = 1;
            } else if (strcmp (opt, "mbox") == 0) {
                format = &format_mbox;
            } else if (strcmp (opt, "raw") == 0) {
@@ -688,7 +688,7 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))
                return 1;
            }
        } else if (STRNCMP_LITERAL (argv[i], "--entire-thread") == 0) {
-           entire_thread = 1;
+           params.entire_thread = 1;
        } else {
            fprintf (stderr, "Unrecognized option: %s\n", argv[i]);
            return 1;
@@ -727,7 +727,7 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))
     if (raw)
        return do_show_raw (ctx, query);
     else
-       return do_show (ctx, query, format, entire_thread);
+       return do_show (ctx, query, format, &params);
 
     notmuch_query_destroy (query);
     notmuch_database_close (notmuch);