[PATCH v2 6/8] show: Make JSON helper functions print complete objects

diff --git a/aa/201ac5b9dd02d47471dd100a99fbd60c939fe0 b/aa/201ac5b9dd02d47471dd100a99fbd60c939fe0
new file mode 100644 (file)
index 0000000..b456826
--- /dev/null
+++ b/aa/201ac5b9dd02d47471dd100a99fbd60c939fe0
@@ -0,0 +1,154 @@
+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 4346D431FC0\r
+       for <notmuch@notmuchmail.org>; Sun, 19 Feb 2012 16:26:41 -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 SuFH6KCss4cb for <notmuch@notmuchmail.org>;\r
+       Sun, 19 Feb 2012 16:26:39 -0800 (PST)\r
+Received: from dmz-mailsec-scanner-7.mit.edu (DMZ-MAILSEC-SCANNER-7.MIT.EDU\r
+       [18.7.68.36])\r
+       by olra.theworths.org (Postfix) with ESMTP id 80F05431FC4\r
+       for <notmuch@notmuchmail.org>; Sun, 19 Feb 2012 16:26:36 -0800 (PST)\r
+X-AuditID: 12074424-b7fae6d000000906-e3-4f41933b973a\r
+Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])\r
+       by dmz-mailsec-scanner-7.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id 93.22.02310.B33914F4; 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-1.mit.edu (8.13.8/8.9.2) with ESMTP id q1K0QZk9016451; \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 q1K0QYti000303\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 1RzH5N-0001yR-U1; Sun, 19 Feb 2012 19:26:33 -0500\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 6/8] show: Make JSON helper functions print complete\r
+ objects\r
+Date: Sun, 19 Feb 2012 19:26:28 -0500\r
+Message-Id: <1329697590-7404-7-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+NgFtrDIsWRmVeSWpSXmKPExsUixCmqrGsz2dHfYP1MFovrN2cyW7xZOY/V\r
+       gcnj8NeFLB7PVt1iDmCK4rJJSc3JLEst0rdL4Mo4uecBc8E0kYplOw+zNjDOFOhi5OSQEDCR\r
+       uLJ5MROELSZx4d56ti5GLg4hgX2MEo3vr7CCJIQENjBKvPhpCJG4zySx+tB0dghnPqPEp4eH\r
+       mUGq2AQ0JLbtX84IYosISEvsvDsbrJtZwEri8NVNYLawgL/E0UW3wWwWAVWJSxeOsIHYvAL2\r
+       Eu/Wv2SDOENB4tzqc0ALODg4BRwkVu9whTiiVOLIky1MExj5FzAyrGKUTcmt0s1NzMwpTk3W\r
+       LU5OzMtLLdI118vNLNFLTSndxAgKJHYXlR2MzYeUDjEKcDAq8fBKljn4C7EmlhVX5h5ilORg\r
+       UhLlXTfJ0V+ILyk/pTIjsTgjvqg0J7X4EKMEB7OSCO8Ce6Acb0piZVVqUT5MSpqDRUmcV0Pr\r
+       nZ+QQHpiSWp2ampBahFMVoaDQ0mCdxfIUMGi1PTUirTMnBKENBMHJ8hwHqDhs0FqeIsLEnOL\r
+       M9Mh8qcYFaXEeetBEgIgiYzSPLheWKS/YhQHekWYdwVIFQ8wScB1vwIazAQ0mFfIDmRwSSJC\r
+       SqqBcYLd552RUQlbNZ+dNzlZXPNzg+sZ53cJ7bUbjpVVS1z4vFOu6bY2cyB35Z/PF9mdPga8\r
+       3Hjqluoph1ssHeHx6mf6v0w0jHrOWjrzdMrO78J+jj8k7mVzXE9WexirLV5y+fe7unm5Oqxx\r
+       209vnL4uw2COBI8Xx7rPC1q3OtTvfhGcMuPkR2dJLiWW4oxEQy3mouJEAAeZNQ3PAgAA\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:41 -0000\r
+\r
+This makes the main recursive function easier to follow because helper\r
+functions don't add fields to the running object.\r
+---\r
+ notmuch-show.c |   15 +++++++--------\r
+ 1 files changed, 7 insertions(+), 8 deletions(-)\r
+\r
+diff --git a/notmuch-show.c b/notmuch-show.c\r
+index 6259d30..8fb6fa6 100644\r
+--- a/notmuch-show.c\r
++++ b/notmuch-show.c\r
+@@ -297,7 +297,7 @@ format_headers_json (const void *ctx, GMimeMessage *message)\r
+     InternetAddressList *recipients;\r
+     const char *recipients_string;\r
+ \r
+-    printf ("%s: %s",\r
++    printf ("{%s: %s",\r
+           json_quote_str (local, "Subject"),\r
+           json_quote_str (local, g_mime_message_get_subject (message)));\r
+     printf (", %s: %s",\r
+@@ -315,7 +315,7 @@ format_headers_json (const void *ctx, GMimeMessage *message)\r
+       printf (", %s: %s",\r
+               json_quote_str (local, "Cc"),\r
+               json_quote_str (local, recipients_string));\r
+-    printf (", %s: %s",\r
++    printf (", %s: %s}",\r
+           json_quote_str (local, "Date"),\r
+           json_quote_str (local, g_mime_message_get_date_as_string (message)));\r
+ \r
+@@ -406,7 +406,7 @@ signer_status_to_string (GMimeSignerStatus x)\r
+ static void\r
+ format_part_sigstatus_json (GMimeSignatureList *siglist)\r
+ {\r
+-    printf (", \"sigstatus\": [");\r
++    printf ("[");\r
+ \r
+     if (!siglist) {\r
+       printf ("]");\r
+@@ -472,7 +472,7 @@ format_part_sigstatus_json (GMimeSignatureList *siglist)\r
+ static void\r
+ format_part_sigstatus_json (const GMimeSignatureValidity* validity)\r
+ {\r
+-    printf (", \"sigstatus\": [");\r
++    printf ("[");\r
+ \r
+     if (!validity) {\r
+       printf ("]");\r
+@@ -658,9 +658,8 @@ format_part_json (const void *ctx, mime_node_t *node, notmuch_bool_t first)\r
+       printf ("{");\r
+       format_message_json (ctx, node->envelope_file);\r
+ \r
+-      printf ("\"headers\": {");\r
++      printf ("\"headers\": ");\r
+       format_headers_json (ctx, GMIME_MESSAGE (node->part));\r
+-      printf ("}");\r
+ \r
+       printf (", \"body\": [");\r
+       format_part_json (ctx, mime_node_child (node, 0), first);\r
+@@ -696,6 +695,7 @@ format_part_json (const void *ctx, mime_node_t *node, notmuch_bool_t first)\r
+     }\r
+ \r
+     if (node->verify_attempted) {\r
++      printf (", \"sigstatus\": ");\r
+ #ifdef GMIME_ATLEAST_26\r
+       format_part_sigstatus_json (node->sig_list);\r
+ #else\r
+@@ -746,9 +746,8 @@ format_part_json (const void *ctx, mime_node_t *node, notmuch_bool_t first)\r
+       g_object_unref (stream_memory);\r
+ \r
+     if (GMIME_IS_MESSAGE (node->part)) {\r
+-      printf ("\"headers\": {");\r
++      printf ("\"headers\": ");\r
+       format_headers_json (local, GMIME_MESSAGE (node->part));\r
+-      printf ("}");\r
+ \r
+       printf (", \"body\": [");\r
+     }\r
+-- \r
+1.7.7.3\r
+\r