--- /dev/null
+Return-Path: <amthrax@drake.mit.edu>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by olra.theworths.org (Postfix) with ESMTP id A2194431FC0\r
+ for <notmuch@notmuchmail.org>; Sun, 19 Feb 2012 16:26:42 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+ tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+ by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id PSUr2-gbISBf for <notmuch@notmuchmail.org>;\r
+ Sun, 19 Feb 2012 16:26:39 -0800 (PST)\r
+Received: from dmz-mailsec-scanner-8.mit.edu (DMZ-MAILSEC-SCANNER-8.MIT.EDU\r
+ [18.7.68.37])\r
+ by olra.theworths.org (Postfix) with ESMTP id 67E43431FC3\r
+ for <notmuch@notmuchmail.org>; Sun, 19 Feb 2012 16:26:36 -0800 (PST)\r
+X-AuditID: 12074425-b7f4a6d0000008e0-bf-4f41933b105c\r
+Received: from mailhub-auth-3.mit.edu ( [18.9.21.43])\r
+ by dmz-mailsec-scanner-8.mit.edu (Symantec Messaging Gateway) with SMTP\r
+ id 62.74.02272.B33914F4; Sun, 19 Feb 2012 19:26:35 -0500 (EST)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+ by mailhub-auth-3.mit.edu (8.13.8/8.9.2) with ESMTP id q1K0QZms024836; \r
+ Sun, 19 Feb 2012 19:26:35 -0500\r
+Received: from drake.mit.edu\r
+ (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
+ [209.6.116.242]) (authenticated bits=0)\r
+ (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+ by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q1K0QXr6000300\r
+ (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+ Sun, 19 Feb 2012 19:26:34 -0500 (EST)\r
+Received: from amthrax by drake.mit.edu with local (Exim 4.77)\r
+ (envelope-from <amthrax@drake.mit.edu>)\r
+ id 1RzH5N-0001yF-Cc; Sun, 19 Feb 2012 19:26:33 -0500\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 2/8] show: Convert JSON format to the new self-recursive\r
+ style\r
+Date: Sun, 19 Feb 2012 19:26:24 -0500\r
+Message-Id: <1329697590-7404-3-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.7.3\r
+In-Reply-To: <1329697590-7404-1-git-send-email-amdragon@mit.edu>\r
+References: <1329240823-7856-1-git-send-email-amdragon@mit.edu>\r
+ <1329697590-7404-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFtrNIsWRmVeSWpSXmKPExsUixCmqrWs92dHfoP+RscX1mzOZLd6snMfq\r
+ wORx+OtCFo9nq24xBzBFcdmkpOZklqUW6dslcGV8PPmYsaAjqOLkrLIGxtuOXYycHBICJhIv\r
+ 9vWzQdhiEhfurQeyuTiEBPYxSjSeesoE4WxglFg3tZcVwrnPJHHk1U+osvmMErN657KC9LMJ\r
+ aEhs27+cEcQWEZCW2Hl3NlicWcBK4vDVTUA2B4ewQKDEvR59kDCLgKrEv5lLWEBsXgF7iQmv\r
+ rjBBnKEgcW71OXaQck4BB4nVO1xBwkICpRJHnmxhmsDIv4CRYRWjbEpulW5uYmZOcWqybnFy\r
+ Yl5eapGuhV5uZoleakrpJkZQGLG7qO5gnHBI6RCjAAejEg+vZJmDvxBrYllxZe4hRkkOJiVR\r
+ 3nWTHP2F+JLyUyozEosz4otKc1KLDzFKcDArifAusAfK8aYkVlalFuXDpKQ5WJTEeTW13vkJ\r
+ CaQnlqRmp6YWpBbBZGU4OJQkeHeBDBUsSk1PrUjLzClBSDNxcIIM5wEaPhukhre4IDG3ODMd\r
+ In+KUVFKnLceJCEAksgozYPrhcX5K0ZxoFeEeVeAVPEAUwRc9yugwUxAg3mF7EAGlyQipKQa\r
+ GGt/breTWuST2v7i2QTpm+nvlLaIn1PNtlP7zpI8b0N7parfZWMtR7UY5SfHFFWnbHywzdZb\r
+ ct7E1Z/8Chz4b3842xPDfOjerNCHFixMJ5x+VHn/Zg2a52qcdvBD3pP1wZf/2ATyzGc/9GPW\r
+ BJ/sHIs5crM80nQ3d+rtPLc7psulkuf0kwdbtJRYijMSDbWYi4oTAfWiKVDOAgAA\r
+Cc: tomi.ollila@iki.fi\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Mon, 20 Feb 2012 00:26:43 -0000\r
+\r
+As before, this is all code movement and a smidgen of glue. This\r
+moves the existing JSON formatter code into one self-recursive\r
+function, but doesn't change any of the logic to take advantage of the\r
+new structure.\r
+\r
+In general, "leafs" of the JSON structure are left in helper functions\r
+(most of them untouched), so that it's easy to see the overall\r
+structure of the format from the main recursive function.\r
+---\r
+ notmuch-show.c | 273 ++++++++++++++++++++++++++++----------------------------\r
+ 1 files changed, 135 insertions(+), 138 deletions(-)\r
+\r
+diff --git a/notmuch-show.c b/notmuch-show.c\r
+index 93fb16f..868b2cd 100644\r
+--- a/notmuch-show.c\r
++++ b/notmuch-show.c\r
+@@ -35,52 +35,14 @@ static const notmuch_show_format_t format_text = {\r
+ };\r
+ \r
+ static void\r
+-format_message_json (const void *ctx,\r
+- notmuch_message_t *message,\r
+- unused (int indent));\r
+-static void\r
+-format_headers_json (const void *ctx,\r
+- notmuch_message_t *message);\r
++format_part_json_entry (const void *ctx, mime_node_t *node,\r
++ int indent, const notmuch_show_params_t *params);\r
+ \r
+-static void\r
+-format_headers_message_part_json (GMimeMessage *message);\r
+-\r
+-static void\r
+-format_part_start_json (unused (GMimeObject *part),\r
+- int *part_count);\r
+-\r
+-static void\r
+-format_part_encstatus_json (int status);\r
+-\r
+-static void\r
+-#ifdef GMIME_ATLEAST_26\r
+-format_part_sigstatus_json (GMimeSignatureList* siglist);\r
+-#else\r
+-format_part_sigstatus_json (const GMimeSignatureValidity* validity);\r
+-#endif\r
+-\r
+-static void\r
+-format_part_content_json (GMimeObject *part);\r
+-\r
+-static void\r
+-format_part_end_json (GMimeObject *part);\r
+-\r
+-/* Any changes to the JSON format should be reflected in the file\r
+- * devel/schemata. */\r
+ static const notmuch_show_format_t format_json = {\r
+- "[", NULL,\r
+- "{", format_message_json,\r
+- "\"headers\": {", format_headers_json, format_headers_message_part_json, "}",\r
+- ", \"body\": [",\r
+- format_part_start_json,\r
+- format_part_encstatus_json,\r
+- format_part_sigstatus_json,\r
+- format_part_content_json,\r
+- format_part_end_json,\r
+- ", ",\r
+- "]",\r
+- "}", ", ",\r
+- "]"\r
++ .message_set_start = "[",\r
++ .part = format_part_json_entry,\r
++ .message_set_sep = ", ",\r
++ .message_set_end = "]"\r
+ };\r
+ \r
+ static void\r
+@@ -170,7 +132,7 @@ _get_one_line_summary (const void *ctx, notmuch_message_t *message)\r
+ }\r
+ \r
+ static void\r
+-format_message_json (const void *ctx, notmuch_message_t *message, unused (int indent))\r
++format_message_json (const void *ctx, notmuch_message_t *message)\r
+ {\r
+ notmuch_tags_t *tags;\r
+ int first = 1;\r
+@@ -471,24 +433,6 @@ signer_status_to_string (GMimeSignerStatus x)\r
+ }\r
+ #endif\r
+ \r
+-static void\r
+-format_part_start_json (unused (GMimeObject *part), int *part_count)\r
+-{\r
+- printf ("{\"id\": %d", *part_count);\r
+-}\r
+-\r
+-static void\r
+-format_part_encstatus_json (int status)\r
+-{\r
+- printf (", \"encstatus\": [{\"status\": ");\r
+- if (status) {\r
+- printf ("\"good\"");\r
+- } else {\r
+- printf ("\"bad\"");\r
+- }\r
+- printf ("}]");\r
+-}\r
+-\r
+ #ifdef GMIME_ATLEAST_26\r
+ static void\r
+ format_part_sigstatus_json (GMimeSignatureList *siglist)\r
+@@ -619,81 +563,6 @@ format_part_sigstatus_json (const GMimeSignatureValidity* validity)\r
+ #endif\r
+ \r
+ static void\r
+-format_part_content_json (GMimeObject *part)\r
+-{\r
+- GMimeContentType *content_type = g_mime_object_get_content_type (GMIME_OBJECT (part));\r
+- GMimeStream *stream_memory = g_mime_stream_mem_new ();\r
+- const char *cid = g_mime_object_get_content_id (part);\r
+- void *ctx = talloc_new (NULL);\r
+- GByteArray *part_content;\r
+-\r
+- printf (", \"content-type\": %s",\r
+- json_quote_str (ctx, g_mime_content_type_to_string (content_type)));\r
+-\r
+- if (cid != NULL)\r
+- printf(", \"content-id\": %s", json_quote_str (ctx, cid));\r
+-\r
+- if (GMIME_IS_PART (part))\r
+- {\r
+- const char *filename = g_mime_part_get_filename (GMIME_PART (part));\r
+- if (filename)\r
+- printf (", \"filename\": %s", json_quote_str (ctx, filename));\r
+- }\r
+-\r
+- if (g_mime_content_type_is_type (content_type, "text", "*"))\r
+- {\r
+- /* For non-HTML text parts, we include the content in the\r
+- * JSON. Since JSON must be Unicode, we handle charset\r
+- * decoding here and do not report a charset to the caller.\r
+- * For text/html parts, we do not include the content. If a\r
+- * caller is interested in text/html parts, it should retrieve\r
+- * them separately and they will not be decoded. Since this\r
+- * makes charset decoding the responsibility on the caller, we\r
+- * report the charset for text/html parts.\r
+- */\r
+- if (g_mime_content_type_is_type (content_type, "text", "html"))\r
+- {\r
+- const char *content_charset = g_mime_object_get_content_type_parameter (GMIME_OBJECT (part), "charset");\r
+-\r
+- if (content_charset != NULL)\r
+- printf (", \"content-charset\": %s", json_quote_str (ctx, content_charset));\r
+- }\r
+- else\r
+- {\r
+- show_text_part_content (part, stream_memory);\r
+- part_content = g_mime_stream_mem_get_byte_array (GMIME_STREAM_MEM (stream_memory));\r
+-\r
+- printf (", \"content\": %s", json_quote_chararray (ctx, (char *) part_content->data, part_content->len));\r
+- }\r
+- }\r
+- else if (g_mime_content_type_is_type (content_type, "multipart", "*"))\r
+- {\r
+- printf (", \"content\": [");\r
+- }\r
+- else if (g_mime_content_type_is_type (content_type, "message", "rfc822"))\r
+- {\r
+- printf (", \"content\": [{");\r
+- }\r
+-\r
+- talloc_free (ctx);\r
+- if (stream_memory)\r
+- g_object_unref (stream_memory);\r
+-}\r
+-\r
+-static void\r
+-format_part_end_json (GMimeObject *part)\r
+-{\r
+- GMimeContentType *content_type = g_mime_object_get_content_type (GMIME_OBJECT (part));\r
+-\r
+- if (g_mime_content_type_is_type (content_type, "multipart", "*"))\r
+- printf ("]");\r
+- else if (g_mime_content_type_is_type (content_type, "message", "rfc822"))\r
+- printf ("}]");\r
+-\r
+- printf ("}");\r
+-}\r
+-\r
+-static void\r
+ format_part_content_raw (GMimeObject *part)\r
+ {\r
+ if (! GMIME_IS_PART (part))\r
+@@ -811,6 +680,134 @@ format_part_text (const void *ctx, mime_node_t *node,\r
+ }\r
+ \r
+ static void\r
++format_part_json (const void *ctx, mime_node_t *node, notmuch_bool_t first)\r
++{\r
++ /* Any changes to the JSON format should be reflected in the file\r
++ * devel/schemata. */\r
++\r
++ if (node->envelope_file) {\r
++ printf ("{");\r
++ format_message_json (ctx, node->envelope_file);\r
++\r
++ printf ("\"headers\": {");\r
++ format_headers_json (ctx, node->envelope_file);\r
++ printf ("}");\r
++\r
++ printf (", \"body\": [");\r
++ format_part_json (ctx, mime_node_child (node, 0), first);\r
++\r
++ printf ("]}");\r
++ return;\r
++ }\r
++\r
++ void *local = talloc_new (ctx);\r
++ /* The disposition and content-type metadata are associated with\r
++ * the envelope for message parts */\r
++ GMimeObject *meta = node->envelope_part ?\r
++ GMIME_OBJECT (node->envelope_part) : node->part;\r
++ GMimeContentType *content_type = g_mime_object_get_content_type (meta);\r
++ GMimeStream *stream_memory = g_mime_stream_mem_new ();\r
++ const char *cid = g_mime_object_get_content_id (meta);\r
++ GByteArray *part_content;\r
++ int i;\r
++\r
++ if (!first)\r
++ printf (", ");\r
++\r
++ printf ("{\"id\": %d", node->part_num);\r
++\r
++ if (node->decrypt_attempted) {\r
++ printf (", \"encstatus\": [{\"status\": ");\r
++ if (node->decrypt_success) {\r
++ printf ("\"good\"");\r
++ } else {\r
++ printf ("\"bad\"");\r
++ }\r
++ printf ("}]");\r
++ }\r
++\r
++ if (node->verify_attempted) {\r
++#ifdef GMIME_ATLEAST_26\r
++ format_part_sigstatus_json (node->sig_list);\r
++#else\r
++ format_part_sigstatus_json (node->sig_validity);\r
++#endif\r
++ }\r
++\r
++ printf (", \"content-type\": %s",\r
++ json_quote_str (local, g_mime_content_type_to_string (content_type)));\r
++\r
++ if (cid != NULL)\r
++ printf(", \"content-id\": %s", json_quote_str (local, cid));\r
++\r
++ if (GMIME_IS_PART (node->part)) {\r
++ const char *filename = g_mime_part_get_filename (GMIME_PART (node->part));\r
++ if (filename)\r
++ printf (", \"filename\": %s", json_quote_str (local, filename));\r
++ }\r
++\r
++ if (g_mime_content_type_is_type (content_type, "text", "*")) {\r
++ /* For non-HTML text parts, we include the content in the\r
++ * JSON. Since JSON must be Unicode, we handle charset\r
++ * decoding here and do not report a charset to the caller.\r
++ * For text/html parts, we do not include the content. If a\r
++ * caller is interested in text/html parts, it should retrieve\r
++ * them separately and they will not be decoded. Since this\r
++ * makes charset decoding the responsibility on the caller, we\r
++ * report the charset for text/html parts.\r
++ */\r
++ if (g_mime_content_type_is_type (content_type, "text", "html")) {\r
++ const char *content_charset = g_mime_object_get_content_type_parameter (meta, "charset");\r
++\r
++ if (content_charset != NULL)\r
++ printf (", \"content-charset\": %s", json_quote_str (local, content_charset));\r
++ } else {\r
++ show_text_part_content (node->part, stream_memory);\r
++ part_content = g_mime_stream_mem_get_byte_array (GMIME_STREAM_MEM (stream_memory));\r
++\r
++ printf (", \"content\": %s", json_quote_chararray (local, (char *) part_content->data, part_content->len));\r
++ }\r
++ } else if (g_mime_content_type_is_type (content_type, "multipart", "*")) {\r
++ printf (", \"content\": [");\r
++ } else if (g_mime_content_type_is_type (content_type, "message", "rfc822")) {\r
++ printf (", \"content\": [{");\r
++ }\r
++\r
++ if (stream_memory)\r
++ g_object_unref (stream_memory);\r
++\r
++ if (GMIME_IS_MESSAGE (node->part)) {\r
++ printf ("\"headers\": {");\r
++ format_headers_message_part_json (GMIME_MESSAGE (node->part));\r
++ printf ("}");\r
++\r
++ printf (", \"body\": [");\r
++ }\r
++\r
++ for (i = 0; i < node->nchildren; i++)\r
++ format_part_json (ctx, mime_node_child (node, i), i == 0);\r
++\r
++ if (GMIME_IS_MESSAGE (node->part))\r
++ printf ("]");\r
++\r
++ if (g_mime_content_type_is_type (content_type, "multipart", "*"))\r
++ printf ("]");\r
++ else if (g_mime_content_type_is_type (content_type, "message", "rfc822"))\r
++ printf ("}]");\r
++\r
++ printf ("}");\r
++\r
++ talloc_free (local);\r
++}\r
++\r
++static void\r
++format_part_json_entry (const void *ctx, mime_node_t *node, unused (int indent),\r
++ unused (const notmuch_show_params_t *params))\r
++{\r
++ format_part_json (ctx, node, TRUE);\r
++}\r
++\r
++static void\r
+ show_message (void *ctx,\r
+ const notmuch_show_format_t *format,\r
+ notmuch_message_t *message,\r
+-- \r
+1.7.7.3\r
+\r
projects / notmuch-archives.git / commitdiff