#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_text (GMimeObject *part,
- int *part_count,
- int first);
+ int *part_count);
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",
- "\fbody{\n", format_part_text, format_part_end_text, "\fbody}\n",
+ "\fbody{\n", format_part_text, format_part_end_text, "", "\fbody}\n",
"\fmessage}\n", "",
""
};
static void
format_part_json (GMimeObject *part,
- int *part_count,
- int first);
+ int *part_count);
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, "}",
- ", \"body\": [", format_part_json, format_part_end_json, "]",
+ ", \"body\": [", format_part_json, format_part_end_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, "",
- "", NULL, NULL, "",
+ "", NULL, NULL, "", "",
"", "",
""
};
}
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;
}
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;
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 (! 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)
}
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,
- 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;
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);
fputs (format->message_set_end, stdout);
}
-/* Support for --format=raw */
+/* Formatted output of single message */
static int
-do_show_raw (unused(void *ctx), notmuch_query_t *query)
+do_show_single (void *ctx,
+ notmuch_query_t *query,
+ const notmuch_show_format_t *format,
+ notmuch_show_params_t *params)
{
notmuch_messages_t *messages;
notmuch_message_t *message;
- const char *filename;
- FILE *file;
- size_t size;
- char buf[4096];
if (notmuch_query_count_messages (query) != 1) {
fprintf (stderr, "Error: search term did not match precisely one message.\n");
return 1;
}
- filename = notmuch_message_get_filename (message);
- if (filename == NULL) {
- fprintf (stderr, "Error: Cannot message filename.\n");
- return 1;
- }
+ /* Special case for --format=raw of full single message, just cat out file */
+ if (params->raw) {
- file = fopen (filename, "r");
- if (file == NULL) {
- fprintf (stderr, "Error: Cannot open file %s: %s\n", filename, strerror (errno));
- return 1;
- }
+ const char *filename;
+ FILE *file;
+ size_t size;
+ char buf[4096];
- while (!feof (file)) {
- size = fread (buf, 1, sizeof (buf), file);
- fwrite (buf, size, 1, stdout);
- }
+ filename = notmuch_message_get_filename (message);
+ if (filename == NULL) {
+ fprintf (stderr, "Error: Cannot message filename.\n");
+ return 1;
+ }
- fclose (file);
+ file = fopen (filename, "r");
+ if (file == NULL) {
+ fprintf (stderr, "Error: Cannot open file %s: %s\n", filename, strerror (errno));
+ return 1;
+ }
+
+ while (!feof (file)) {
+ size = fread (buf, 1, sizeof (buf), file);
+ fwrite (buf, size, 1, stdout);
+ }
+
+ fclose (file);
+
+ }
return 0;
}
-/* Support for --format=text|json|mbox */
+/* Formatted output of threads */
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;
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);
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;
+ params.raw = 0;
for (i = 0; i < argc && argv[i][0] == '-'; i++) {
if (strcmp (argv[i], "--") == 0) {
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) {
- raw = 1;
+ params.raw = 1;
} else {
fprintf (stderr, "Invalid value for --format: %s\n", opt);
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;
return 1;
}
- if (raw)
- return do_show_raw (ctx, query);
+ /* If --format=raw specified without specifying part, we can only
+ * output single message, so set part=0 */
+ if (params.raw)
+ return do_show_single (ctx, query, format, ¶ms);
else
- return do_show (ctx, query, format, entire_thread);
+ return do_show (ctx, query, format, ¶ms);
notmuch_query_destroy (query);
notmuch_database_close (notmuch);
projects / notmuch / blobdiff