create notmuch_show_params_t structure for holding parameters passed to show functions.

[notmuch] / notmuch-show.c

diff --git a/notmuch-show.c b/notmuch-show.c
index 8f485eff7248f076de99228946f57ec3f16e81ea..006ccf9e3ee35f9375299bfa09f5be82123519f7 100644 (file)
--- a/notmuch-show.c
+++ b/notmuch-show.c
@@ -20,26 +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, int first);
-    void (*part_end) (GMimeObject *part);
-    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,
@@ -56,7 +36,7 @@ format_part_text (GMimeObject *part,
 static void
 format_part_end_text (GMimeObject *part);
 
-static const show_format_t format_text = {
+static const notmuch_show_format_t format_text = {
     "",
        "\fmessage{ ", format_message_text,
            "\fheader{\n", format_headers_text, "\fheader}\n",
@@ -81,7 +61,7 @@ format_part_json (GMimeObject *part,
 static void
 format_part_end_json (GMimeObject *part);
 
-static const show_format_t format_json = {
+static const notmuch_show_format_t format_json = {
     "[",
        "{", format_message_json,
            ", \"headers\": {", format_headers_json, "}",
@@ -95,7 +75,7 @@ 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, "",
@@ -458,6 +438,7 @@ format_part_json (GMimeObject *part, int *part_count, int first)
     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));
 
@@ -468,6 +449,11 @@ format_part_json (GMimeObject *part, int *part_count, int first)
            *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)
@@ -509,7 +495,10 @@ format_part_end_json (GMimeObject *part)
 }
 
 static void
-show_message (void *ctx, const show_format_t *format, notmuch_message_t *message, int indent)
+show_message (void *ctx,
+             const notmuch_show_format_t *format,
+             notmuch_message_t *message,
+             int indent)
 {
     fputs (format->message_start, stdout);
     if (format->message)
@@ -523,7 +512,7 @@ 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, format->part_end);
+                          format);
     fputs (format->body_end, stdout);
 
     fputs (format->message_end, stdout);
@@ -531,8 +520,11 @@ 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,
-              notmuch_bool_t entire_thread)
+show_messages (void *ctx,
+              const notmuch_show_format_t *format,
+              notmuch_messages_t *messages,
+              int indent,
+              notmuch_show_params_t *params)
 {
     notmuch_message_t *message;
     notmuch_bool_t match;
@@ -557,15 +549,18 @@ show_messages (void *ctx, const show_format_t *format, notmuch_messages_t *messa
 
        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);
 
@@ -625,8 +620,8 @@ 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,
-        int entire_thread)
+        const notmuch_show_format_t *format,
+        notmuch_show_params_t *params)
 {
     notmuch_threads_t *threads;
     notmuch_thread_t *thread;
@@ -651,7 +646,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);
 
@@ -670,11 +665,13 @@ 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;
-    int entire_thread = 0;
+    const notmuch_show_format_t *format = &format_text;
+    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++;
@@ -686,7 +683,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) {
@@ -696,7 +693,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;
@@ -735,7 +732,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);