}
static void
-format_headers_json (const void *ctx, notmuch_message_t *message)
+format_headers_json (const void *ctx, GMimeMessage *message)
{
- const char *headers[] = {
- "Subject", "From", "To", "Cc", "Bcc", "Date"
- };
- const char *name, *value;
- unsigned int i;
- int first_header = 1;
- void *ctx_quote = talloc_new (ctx);
-
- for (i = 0; i < ARRAY_SIZE (headers); i++) {
- name = headers[i];
- value = notmuch_message_get_header (message, name);
- if (value)
- {
- if (!first_header)
- fputs (", ", stdout);
- first_header = 0;
-
- printf ("%s: %s",
- json_quote_str (ctx_quote, name),
- json_quote_str (ctx_quote, value));
- }
- }
-
- talloc_free (ctx_quote);
-}
-
-static void
-format_headers_message_part_json (GMimeMessage *message)
-{
- void *ctx = talloc_new (NULL);
- void *ctx_quote = talloc_new (ctx);
+ void *local = talloc_new (ctx);
InternetAddressList *recipients;
const char *recipients_string;
- printf ("%s: %s",
- json_quote_str (ctx_quote, "Subject"),
- json_quote_str (ctx_quote, g_mime_message_get_subject (message)));
+ printf ("{%s: %s",
+ json_quote_str (local, "Subject"),
+ json_quote_str (local, g_mime_message_get_subject (message)));
printf (", %s: %s",
- json_quote_str (ctx_quote, "From"),
- json_quote_str (ctx_quote, g_mime_message_get_sender (message)));
+ json_quote_str (local, "From"),
+ json_quote_str (local, g_mime_message_get_sender (message)));
recipients = g_mime_message_get_recipients (message, GMIME_RECIPIENT_TYPE_TO);
recipients_string = internet_address_list_to_string (recipients, 0);
if (recipients_string)
printf (", %s: %s",
- json_quote_str (ctx_quote, "To"),
- json_quote_str (ctx_quote, recipients_string));
+ json_quote_str (local, "To"),
+ json_quote_str (local, recipients_string));
recipients = g_mime_message_get_recipients (message, GMIME_RECIPIENT_TYPE_CC);
recipients_string = internet_address_list_to_string (recipients, 0);
if (recipients_string)
printf (", %s: %s",
- json_quote_str (ctx_quote, "Cc"),
- json_quote_str (ctx_quote, recipients_string));
- printf (", %s: %s",
- json_quote_str (ctx_quote, "Date"),
- json_quote_str (ctx_quote, g_mime_message_get_date_as_string (message)));
+ json_quote_str (local, "Cc"),
+ json_quote_str (local, recipients_string));
+ printf (", %s: %s}",
+ json_quote_str (local, "Date"),
+ json_quote_str (local, g_mime_message_get_date_as_string (message)));
- talloc_free (ctx_quote);
- talloc_free (ctx);
+ talloc_free (local);
}
/* Write a MIME text part out to the given stream.
#ifdef GMIME_ATLEAST_26
static void
-format_part_sigstatus_json (GMimeSignatureList *siglist)
+format_part_sigstatus_json (mime_node_t *node)
{
- printf (", \"sigstatus\": [");
+ GMimeSignatureList *siglist = node->sig_list;
+
+ printf ("[");
if (!siglist) {
printf ("]");
}
#else
static void
-format_part_sigstatus_json (const GMimeSignatureValidity* validity)
+format_part_sigstatus_json (mime_node_t *node)
{
- printf (", \"sigstatus\": [");
+ const GMimeSignatureValidity* validity = node->sig_validity;
+
+ printf ("[");
if (!validity) {
printf ("]");
printf ("{");
format_message_json (ctx, node->envelope_file);
- printf ("\"headers\": {");
- format_headers_json (ctx, node->envelope_file);
- printf ("}");
+ printf ("\"headers\": ");
+ format_headers_json (ctx, GMIME_MESSAGE (node->part));
printf (", \"body\": [");
format_part_json (ctx, mime_node_child (node, 0), first);
GMimeObject *meta = node->envelope_part ?
GMIME_OBJECT (node->envelope_part) : node->part;
GMimeContentType *content_type = g_mime_object_get_content_type (meta);
- GMimeStream *stream_memory = g_mime_stream_mem_new ();
const char *cid = g_mime_object_get_content_id (meta);
- GByteArray *part_content;
+ const char *filename = GMIME_IS_PART (node->part) ?
+ g_mime_part_get_filename (GMIME_PART (node->part)) : NULL;
+ const char *terminator = "";
int i;
if (!first)
printf ("{\"id\": %d", node->part_num);
- if (node->decrypt_attempted) {
- printf (", \"encstatus\": [{\"status\": ");
- if (node->decrypt_success) {
- printf ("\"good\"");
- } else {
- printf ("\"bad\"");
- }
- printf ("}]");
- }
+ if (node->decrypt_attempted)
+ printf (", \"encstatus\": [{\"status\": \"%s\"}]",
+ node->decrypt_success ? "good" : "bad");
if (node->verify_attempted) {
-#ifdef GMIME_ATLEAST_26
- format_part_sigstatus_json (node->sig_list);
-#else
- format_part_sigstatus_json (node->sig_validity);
-#endif
+ printf (", \"sigstatus\": ");
+ format_part_sigstatus_json (node);
}
printf (", \"content-type\": %s",
json_quote_str (local, g_mime_content_type_to_string (content_type)));
- if (cid != NULL)
- printf(", \"content-id\": %s", json_quote_str (local, cid));
+ if (cid)
+ printf (", \"content-id\": %s", json_quote_str (local, cid));
- if (GMIME_IS_PART (node->part)) {
- const char *filename = g_mime_part_get_filename (GMIME_PART (node->part));
- if (filename)
- printf (", \"filename\": %s", json_quote_str (local, filename));
- }
+ if (filename)
+ printf (", \"filename\": %s", json_quote_str (local, filename));
- if (g_mime_content_type_is_type (content_type, "text", "*")) {
+ if (GMIME_IS_PART (node->part)) {
/* For non-HTML text parts, we include the content in the
* JSON. Since JSON must be Unicode, we handle charset
* decoding here and do not report a charset to the caller.
if (content_charset != NULL)
printf (", \"content-charset\": %s", json_quote_str (local, content_charset));
- } else {
+ } else if (g_mime_content_type_is_type (content_type, "text", "*")) {
+ GMimeStream *stream_memory = g_mime_stream_mem_new ();
+ GByteArray *part_content;
show_text_part_content (node->part, stream_memory);
part_content = g_mime_stream_mem_get_byte_array (GMIME_STREAM_MEM (stream_memory));
printf (", \"content\": %s", json_quote_chararray (local, (char *) part_content->data, part_content->len));
+ g_object_unref (stream_memory);
}
- } else if (g_mime_content_type_is_type (content_type, "multipart", "*")) {
+ } else if (GMIME_IS_MULTIPART (node->part)) {
printf (", \"content\": [");
- } else if (g_mime_content_type_is_type (content_type, "message", "rfc822")) {
+ terminator = "]";
+ } else if (GMIME_IS_MESSAGE (node->part)) {
printf (", \"content\": [{");
- }
-
- if (stream_memory)
- g_object_unref (stream_memory);
-
- if (GMIME_IS_MESSAGE (node->part)) {
- printf ("\"headers\": {");
- format_headers_message_part_json (GMIME_MESSAGE (node->part));
- printf ("}");
+ printf ("\"headers\": ");
+ format_headers_json (local, GMIME_MESSAGE (node->part));
printf (", \"body\": [");
+ terminator = "]}]";
}
+ talloc_free (local);
+
for (i = 0; i < node->nchildren; i++)
format_part_json (ctx, mime_node_child (node, i), i == 0);
- if (GMIME_IS_MESSAGE (node->part))
- printf ("]");
-
- if (g_mime_content_type_is_type (content_type, "multipart", "*"))
- printf ("]");
- else if (g_mime_content_type_is_type (content_type, "message", "rfc822"))
- printf ("}]");
-
- printf ("}");
-
- talloc_free (local);
+ printf ("%s}", terminator);
}
static void
projects / notmuch / blobdiff