#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,
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",
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, "}",
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, "",
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));
*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)
}
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)
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);
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;
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;
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;