--- /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 DA46A431FC2\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 4qvs8pMRrU7I for <notmuch@notmuchmail.org>;\r
+ Sun, 19 Feb 2012 16:26:41 -0800 (PST)\r
+Received: from dmz-mailsec-scanner-5.mit.edu (DMZ-MAILSEC-SCANNER-5.MIT.EDU\r
+ [18.7.68.34])\r
+ by olra.theworths.org (Postfix) with ESMTP id 94D7E431FC7\r
+ for <notmuch@notmuchmail.org>; Sun, 19 Feb 2012 16:26:36 -0800 (PST)\r
+X-AuditID: 12074422-b7fd66d0000008f9-c3-4f41933c7c3b\r
+Received: from mailhub-auth-2.mit.edu ( [18.7.62.36])\r
+ by dmz-mailsec-scanner-5.mit.edu (Symantec Messaging Gateway) with SMTP\r
+ id 60.06.02297.C33914F4; Sun, 19 Feb 2012 19:26:36 -0500 (EST)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+ by mailhub-auth-2.mit.edu (8.13.8/8.9.2) with ESMTP id q1K0QZLf028406; \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 q1K0QYXY000306\r
+ (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+ Sun, 19 Feb 2012 19:26:35 -0500 (EST)\r
+Received: from amthrax by drake.mit.edu with local (Exim 4.77)\r
+ (envelope-from <amthrax@drake.mit.edu>)\r
+ id 1RzH5O-0001yX-5i; Sun, 19 Feb 2012 19:26:34 -0500\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 8/8] show: Further general simplifications of the JSON\r
+ formatter\r
+Date: Sun, 19 Feb 2012 19:26:30 -0500\r
+Message-Id: <1329697590-7404-9-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+NgFtrDIsWRmVeSWpSXmKPExsUixG6nomsz2dHfYN98UYvrN2cyW7xZOY/V\r
+ gcnj8NeFLB7PVt1iDmCK4rJJSc3JLEst0rdL4Mp4236TpWCuYsX/iRtZGhiPSHUxcnJICJhI\r
+ XLm0lQ3CFpO4cG89kM3FISSwj1Hi2dn/jBDOBkaJlueHWCGc+0wSG3/sYYJw5jNKHH96ggWk\r
+ n01AQ2Lb/uWMILaIgLTEzruzWUFsZgEricNXN4HZwgLBEk8PTASzWQRUJY7tXg60j4ODV8Be\r
+ 4t37YogzFCTOrT7HDhLmFHCQWL3DFSQsJFAqceTJFqYJjPwLGBlWMcqm5Fbp5iZm5hSnJusW\r
+ Jyfm5aUW6Zrq5WaW6KWmlG5iBAeSi9IOxp8HlQ4xCnAwKvHwSpY5+AuxJpYVV+YeYpTkYFIS\r
+ 5T01wdFfiC8pP6UyI7E4I76oNCe1+BCjBAezkgjvAnugHG9KYmVValE+TEqag0VJnFdd652f\r
+ kEB6YklqdmpqQWoRTFaGg0NJgnfXJKBGwaLU9NSKtMycEoQ0EwcnyHAeoOHXQGp4iwsSc4sz\r
+ 0yHypxgVpcR594MkBEASGaV5cL2wSH/FKA70ijBvGkgVDzBJwHW/AhrMBDSYV8gOZHBJIkJK\r
+ qoHRW+fcuubpuxXlqz7y1FkcqUto3LF3W8uD/LsmUwyOF2dYRBRUTri8UereisZM49tNfS/+\r
+ b9nx7OH3Yz9jl9rPrjx/77fopoCrorcu7NfIvZzv9UzpM1P29/MbOxf1R/49eHHVi20HpUwe\r
+ vZgTtzHoq2jzLrao8rkMfvuUTBjEVsgb/1FpLtGeq8RSnJFoqMVcVJwIALZRibLPAgAA\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
+---\r
+ notmuch-show.c | 61 ++++++++++++++++++++-----------------------------------\r
+ 1 files changed, 22 insertions(+), 39 deletions(-)\r
+\r
+diff --git a/notmuch-show.c b/notmuch-show.c\r
+index 07276c7..6a171a4 100644\r
+--- a/notmuch-show.c\r
++++ b/notmuch-show.c\r
+@@ -678,9 +678,10 @@ format_part_json (const void *ctx, mime_node_t *node, notmuch_bool_t first)\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
++ const char *filename = GMIME_IS_PART (node->part) ?\r
++ g_mime_part_get_filename (GMIME_PART (node->part)) : NULL;\r
++ const char *terminator = "";\r
+ int i;\r
+ \r
+ if (!first)\r
+@@ -688,15 +689,9 @@ format_part_json (const void *ctx, mime_node_t *node, notmuch_bool_t first)\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
++ if (node->decrypt_attempted)\r
++ printf (", \"encstatus\": [{\"status\": \"%s\"}]",\r
++ node->decrypt_success ? "good" : "bad");\r
+ \r
+ if (node->verify_attempted) {\r
+ printf (", \"sigstatus\": ");\r
+@@ -706,16 +701,13 @@ format_part_json (const void *ctx, mime_node_t *node, notmuch_bool_t first)\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
++ if (cid)\r
++ printf (", \"content-id\": %s", json_quote_str (local, cid));\r
++\r
++ if (filename)\r
++ printf (", \"filename\": %s", json_quote_str (local, filename));\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
+@@ -730,42 +722,33 @@ format_part_json (const void *ctx, mime_node_t *node, notmuch_bool_t first)\r
+ \r
+ if (content_charset != NULL)\r
+ printf (", \"content-charset\": %s", json_quote_str (local, content_charset));\r
+- } else {\r
++ } else if (g_mime_content_type_is_type (content_type, "text", "*")) {\r
++ GMimeStream *stream_memory = g_mime_stream_mem_new ();\r
++ GByteArray *part_content;\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
++ g_object_unref (stream_memory);\r
+ }\r
+- } else if (g_mime_content_type_is_type (content_type, "multipart", "*")) {\r
++ } else if (GMIME_IS_MULTIPART (node->part)) {\r
+ printf (", \"content\": [");\r
+- } else if (g_mime_content_type_is_type (content_type, "message", "rfc822")) {\r
++ terminator = "]";\r
++ } else if (GMIME_IS_MESSAGE (node->part)) {\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_json (local, GMIME_MESSAGE (node->part));\r
+ \r
+ printf (", \"body\": [");\r
++ terminator = "]}]";\r
+ }\r
+ \r
++ talloc_free (local);\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
++ printf ("%s}", terminator);\r
+ }\r
+ \r
+ static void\r
+-- \r
+1.7.7.3\r
+\r
projects / notmuch-archives.git / commitdiff