From a5e76f51b34c9fd8c4455f1add40303bb32c7006 Mon Sep 17 00:00:00 2001 From: Adam Wolfe Gordon Date: Fri, 20 Jan 2012 10:46:54 +1700 Subject: [PATCH] [PATCH v3 2/5] reply: Add a JSON reply format. --- 79/41db4147c2e49222e3ec87d643d48613024a4e | 428 ++++++++++++++++++++++ 1 file changed, 428 insertions(+) create mode 100644 79/41db4147c2e49222e3ec87d643d48613024a4e diff --git a/79/41db4147c2e49222e3ec87d643d48613024a4e b/79/41db4147c2e49222e3ec87d643d48613024a4e new file mode 100644 index 000000000..496bb8436 --- /dev/null +++ b/79/41db4147c2e49222e3ec87d643d48613024a4e @@ -0,0 +1,428 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 7A18E431FB6 + for ; Thu, 19 Jan 2012 09:47:08 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_NONE=-0.0001] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id QgH9W-AiTYPd for ; + Thu, 19 Jan 2012 09:47:06 -0800 (PST) +Received: from idcmail-mo1so.shaw.ca (idcmail-mo1so.shaw.ca [24.71.223.10]) + by olra.theworths.org (Postfix) with ESMTP id 628C1431FAF + for ; Thu, 19 Jan 2012 09:47:06 -0800 (PST) +Received: from pd2ml1so-ssvc.prod.shaw.ca ([10.0.141.139]) + by pd3mo1so-svcs.prod.shaw.ca with ESMTP; 19 Jan 2012 10:47:05 -0700 +X-Cloudmark-SP-Filtered: true +X-Cloudmark-SP-Result: v=1.1 cv=2TvZ7eE48NdEYeaL5Xf58dNzJU178UzT+2lxUZ5Mhss= + c=1 sm=1 + a=KjgQ5C8P-WoA:10 a=BLceEmwcHowA:10 a=yQp6g8lIsgqumF79BAsFDg==:17 + a=N75QUTFPbXuT58Tj8oQA:9 a=C19m0dVcnEdJqkZIeEwA:7 + a=HpAAvcLHHh0Zw7uRqdWCyQ==:117 +Received: from unknown (HELO lagos.xvx.ca) ([96.52.216.56]) + by pd2ml1so-dmz.prod.shaw.ca with ESMTP; 19 Jan 2012 10:47:05 -0700 +Received: by lagos.xvx.ca (Postfix, from userid 1000) + id 031818004C3C; Thu, 19 Jan 2012 10:47:04 -0700 (MST) +From: Adam Wolfe Gordon +To: notmuch@notmuchmail.org +Subject: [PATCH v3 2/5] reply: Add a JSON reply format. +Date: Thu, 19 Jan 2012 10:46:54 -0700 +Message-Id: <1326995217-27423-3-git-send-email-awg+notmuch@xvx.ca> +X-Mailer: git-send-email 1.7.5.4 +In-Reply-To: <1326995217-27423-1-git-send-email-awg+notmuch@xvx.ca> +References: <1326995217-27423-1-git-send-email-awg+notmuch@xvx.ca> +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Thu, 19 Jan 2012 17:47:09 -0000 + +This new JSON format for replies includes headers generated for a reply +message as well as the headers and all text parts of the original message. +Using this data, a client can intelligently create a reply. For example, +the emacs client will be able to create replies with quoted HTML parts by +parsing the HTML parts using w3m. +--- + notmuch-reply.c | 271 +++++++++++++++++++++++++++++++++++++++++++++++-------- + 1 files changed, 231 insertions(+), 40 deletions(-) + +diff --git a/notmuch-reply.c b/notmuch-reply.c +index 0f682db..b4c2426 100644 +--- a/notmuch-reply.c ++++ b/notmuch-reply.c +@@ -30,6 +30,15 @@ reply_headers_message_part (GMimeMessage *message); + static void + reply_part_content (GMimeObject *part); + ++static void ++reply_part_start_json (GMimeObject *part, int *part_count); ++ ++static void ++reply_part_content_json (GMimeObject *part); ++ ++static void ++reply_part_end_json (GMimeObject *part); ++ + static const notmuch_show_format_t format_reply = { + "", + "", NULL, +@@ -46,6 +55,22 @@ static const notmuch_show_format_t format_reply = { + "" + }; + ++static const notmuch_show_format_t format_json = { ++ "", ++ "", NULL, ++ "", NULL, NULL, "", ++ "", ++ reply_part_start_json, ++ NULL, ++ NULL, ++ reply_part_content_json, ++ reply_part_end_json, ++ "", ++ "", ++ "", "", ++ "" ++}; ++ + static void + show_reply_headers (GMimeMessage *message) + { +@@ -86,6 +111,17 @@ reply_headers_message_part (GMimeMessage *message) + printf ("> Date: %s\n", g_mime_message_get_date_as_string (message)); + } + ++static notmuch_bool_t ++reply_check_part_type (GMimeObject *part, const char *type, const char *subtype, ++ const char *disposition) ++{ ++ GMimeContentType *content_type = g_mime_object_get_content_type (GMIME_OBJECT (part)); ++ GMimeContentDisposition *part_disposition = g_mime_object_get_content_disposition (part); ++ ++ return (g_mime_content_type_is_type (content_type, type, subtype) && ++ (!part_disposition || ++ strcmp (part_disposition->disposition, disposition) == 0)); ++} + + static void + reply_part_content (GMimeObject *part) +@@ -147,6 +183,63 @@ reply_part_content (GMimeObject *part) + } + } + ++static void ++reply_part_start_json (GMimeObject *part, unused (int *part_count)) ++{ ++ if (reply_check_part_type (part, "text", "*", GMIME_DISPOSITION_INLINE)) ++ printf ("{ "); ++} ++ ++static void ++reply_part_end_json (GMimeObject *part) ++{ ++ if (reply_check_part_type (part, "text", "*", GMIME_DISPOSITION_INLINE)) ++ printf ("}, "); ++} ++ ++static void ++reply_part_content_json (GMimeObject *part) ++{ ++ GMimeContentType *content_type = g_mime_object_get_content_type (GMIME_OBJECT (part)); ++ void *ctx = talloc_new (NULL); ++ ++ /* We only care about inline text parts for reply purposes */ ++ if (reply_check_part_type (part, "text", "*", GMIME_DISPOSITION_INLINE)) { ++ GMimeDataWrapper *wrapper; ++ GByteArray *part_content; ++ ++ printf ("\"content-type\": %s, \"content\": ", ++ json_quote_str (ctx, g_mime_content_type_to_string (content_type))); ++ ++ wrapper = g_mime_part_get_content_object (GMIME_PART (part)); ++ if (wrapper) { ++ const char *charset = g_mime_object_get_content_type_parameter (part, "charset"); ++ GMimeStream *stream_memory = g_mime_stream_mem_new (); ++ if (stream_memory) { ++ GMimeStream *stream_filter = NULL; ++ stream_filter = g_mime_stream_filter_new (stream_memory); ++ if (charset) { ++ g_mime_stream_filter_add (GMIME_STREAM_FILTER (stream_filter), ++ g_mime_filter_charset_new (charset, "UTF-8")); ++ } ++ ++ if (stream_filter) { ++ g_mime_data_wrapper_write_to_stream (wrapper, stream_filter); ++ part_content = g_mime_stream_mem_get_byte_array (GMIME_STREAM_MEM (stream_memory)); ++ ++ printf ("%s", json_quote_chararray (ctx, (char *) part_content->data, part_content->len)); ++ g_object_unref (stream_filter); ++ } ++ } ++ ++ if (stream_memory) ++ g_object_unref (stream_memory); ++ } ++ } ++ ++ talloc_free (ctx); ++} ++ + /* Is the given address configured as one of the user's "personal" or + * "other" addresses. */ + static int +@@ -505,6 +598,61 @@ guess_from_received_header (notmuch_config_t *config, notmuch_message_t *message + return NULL; + } + ++static GMimeMessage * ++create_reply_message(void *ctx, ++ notmuch_config_t *config, ++ notmuch_message_t *message, ++ notmuch_bool_t reply_all) ++{ ++ const char *subject, *from_addr = NULL; ++ const char *in_reply_to, *orig_references, *references; ++ ++ /* The 1 means we want headers in a "pretty" order. */ ++ GMimeMessage *reply = g_mime_message_new (1); ++ if (reply == NULL) { ++ fprintf (stderr, "Out of memory\n"); ++ return NULL; ++ } ++ ++ subject = notmuch_message_get_header (message, "subject"); ++ if (subject) { ++ if (strncasecmp (subject, "Re:", 3)) ++ subject = talloc_asprintf (ctx, "Re: %s", subject); ++ g_mime_message_set_subject (reply, subject); ++ } ++ ++ from_addr = add_recipients_from_message (reply, config, ++ message, reply_all); ++ ++ if (from_addr == NULL) ++ from_addr = guess_from_received_header (config, message); ++ ++ if (from_addr == NULL) ++ from_addr = notmuch_config_get_user_primary_email (config); ++ ++ from_addr = talloc_asprintf (ctx, "%s <%s>", ++ notmuch_config_get_user_name (config), ++ from_addr); ++ g_mime_object_set_header (GMIME_OBJECT (reply), ++ "From", from_addr); ++ ++ in_reply_to = talloc_asprintf (ctx, "<%s>", ++ notmuch_message_get_message_id (message)); ++ ++ g_mime_object_set_header (GMIME_OBJECT (reply), ++ "In-Reply-To", in_reply_to); ++ ++ orig_references = notmuch_message_get_header (message, "references"); ++ references = talloc_asprintf (ctx, "%s%s%s", ++ orig_references ? orig_references : "", ++ orig_references ? " " : "", ++ in_reply_to); ++ g_mime_object_set_header (GMIME_OBJECT (reply), ++ "References", references); ++ ++ return reply; ++} ++ + static int + notmuch_reply_format_default(void *ctx, + notmuch_config_t *config, +@@ -515,8 +663,6 @@ notmuch_reply_format_default(void *ctx, + GMimeMessage *reply; + notmuch_messages_t *messages; + notmuch_message_t *message; +- const char *subject, *from_addr = NULL; +- const char *in_reply_to, *orig_references, *references; + const notmuch_show_format_t *format = &format_reply; + + for (messages = notmuch_query_search_messages (query); +@@ -525,62 +671,103 @@ notmuch_reply_format_default(void *ctx, + { + message = notmuch_messages_get (messages); + +- /* The 1 means we want headers in a "pretty" order. */ +- reply = g_mime_message_new (1); +- if (reply == NULL) { +- fprintf (stderr, "Out of memory\n"); +- return 1; +- } ++ reply = create_reply_message (ctx, config, message, reply_all); + +- subject = notmuch_message_get_header (message, "subject"); +- if (subject) { +- if (strncasecmp (subject, "Re:", 3)) +- subject = talloc_asprintf (ctx, "Re: %s", subject); +- g_mime_message_set_subject (reply, subject); +- } ++ if (!reply) ++ continue; + +- from_addr = add_recipients_from_message (reply, config, message, +- reply_all); ++ show_reply_headers (reply); + +- if (from_addr == NULL) +- from_addr = guess_from_received_header (config, message); ++ g_object_unref (G_OBJECT (reply)); ++ reply = NULL; + +- if (from_addr == NULL) +- from_addr = notmuch_config_get_user_primary_email (config); ++ printf ("On %s, %s wrote:\n", ++ notmuch_message_get_header (message, "date"), ++ notmuch_message_get_header (message, "from")); + +- from_addr = talloc_asprintf (ctx, "%s <%s>", +- notmuch_config_get_user_name (config), +- from_addr); +- g_mime_object_set_header (GMIME_OBJECT (reply), +- "From", from_addr); ++ show_message_body (message, format, params); + +- in_reply_to = talloc_asprintf (ctx, "<%s>", +- notmuch_message_get_message_id (message)); ++ notmuch_message_destroy (message); ++ } ++ return 0; ++} + +- g_mime_object_set_header (GMIME_OBJECT (reply), +- "In-Reply-To", in_reply_to); ++static int ++notmuch_reply_format_json(void *ctx, ++ notmuch_config_t *config, ++ notmuch_query_t *query, ++ unused (notmuch_show_params_t *params), ++ notmuch_bool_t reply_all) ++{ ++ GMimeMessage *reply; ++ notmuch_messages_t *messages; ++ notmuch_message_t *message; ++ const notmuch_show_format_t *format = &format_json; + +- orig_references = notmuch_message_get_header (message, "references"); +- references = talloc_asprintf (ctx, "%s%s%s", +- orig_references ? orig_references : "", +- orig_references ? " " : "", +- in_reply_to); +- g_mime_object_set_header (GMIME_OBJECT (reply), +- "References", references); ++ const char *reply_headers[] = {"from", "to", "subject", "in-reply-to", "references"}; ++ const char *orig_headers[] = {"from", "to", "cc", "subject", "date", "in-reply-to", "references"}; ++ unsigned int hidx; + +- show_reply_headers (reply); ++ /* Start array of reply objects */ ++ printf ("["); ++ ++ for (messages = notmuch_query_search_messages (query); ++ notmuch_messages_valid (messages); ++ notmuch_messages_move_to_next (messages)) ++ { ++ message = notmuch_messages_get (messages); ++ reply = create_reply_message (ctx, config, message, reply_all); ++ if (!reply) ++ continue; ++ ++ /* Start a reply object */ ++ printf ("{ \"reply\": { \"headers\": { "); ++ ++ for (hidx = 0; hidx < ARRAY_SIZE (reply_headers); hidx++) ++ { ++ if (hidx) ++ printf (", "); ++ ++ printf ("%s: %s", json_quote_str (ctx, reply_headers[hidx]), ++ json_quote_str (ctx, g_mime_object_get_header (GMIME_OBJECT (reply), reply_headers[hidx]))); ++ } + + g_object_unref (G_OBJECT (reply)); + reply = NULL; + +- printf ("On %s, %s wrote:\n", +- notmuch_message_get_header (message, "date"), +- notmuch_message_get_header (message, "from")); ++ /* Done the headers for the reply, which has no body parts */ ++ printf ("} }"); ++ ++ /* Start the original */ ++ printf (", \"original\": { \"headers\": { "); ++ ++ for (hidx = 0; hidx < ARRAY_SIZE (orig_headers); hidx++) ++ { ++ if (hidx) ++ printf (", "); ++ ++ printf ("%s: %s", json_quote_str (ctx, orig_headers[hidx]), ++ json_quote_str (ctx, notmuch_message_get_header (message, orig_headers[hidx]))); ++ } ++ ++ /* End headers */ ++ printf (" }, \"body\": [ "); + ++ /* Show body parts */ + show_message_body (message, format, params); + + notmuch_message_destroy (message); ++ ++ /* Done the original */ ++ printf ("{} ] }"); ++ ++ /* End the reply object. */ ++ printf (" }, "); + } ++ ++ /* End array of reply objects */ ++ printf ("{} ]\n"); ++ + return 0; + } + +@@ -646,6 +833,7 @@ notmuch_reply_format_headers_only(void *ctx, + + enum { + FORMAT_DEFAULT, ++ FORMAT_JSON, + FORMAT_HEADERS_ONLY, + }; + +@@ -666,6 +854,7 @@ notmuch_reply_command (void *ctx, int argc, char *argv[]) + notmuch_opt_desc_t options[] = { + { NOTMUCH_OPT_KEYWORD, &format, "format", 'f', + (notmuch_keyword_t []){ { "default", FORMAT_DEFAULT }, ++ { "json", FORMAT_JSON }, + { "headers-only", FORMAT_HEADERS_ONLY }, + { 0, 0 } } }, + { NOTMUCH_OPT_KEYWORD, &reply_all, "reply-to", 'r', +@@ -684,6 +873,8 @@ notmuch_reply_command (void *ctx, int argc, char *argv[]) + + if (format == FORMAT_HEADERS_ONLY) + reply_format_func = notmuch_reply_format_headers_only; ++ else if (format == FORMAT_JSON) ++ reply_format_func = notmuch_reply_format_json; + else + reply_format_func = notmuch_reply_format_default; + +-- +1.7.5.4 + -- 2.26.2