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 4346D431FC0 for ; Sun, 19 Feb 2012 16:26:41 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -0.7 X-Spam-Level: X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 SuFH6KCss4cb for ; Sun, 19 Feb 2012 16:26:39 -0800 (PST) Received: from dmz-mailsec-scanner-7.mit.edu (DMZ-MAILSEC-SCANNER-7.MIT.EDU [18.7.68.36]) by olra.theworths.org (Postfix) with ESMTP id 80F05431FC4 for ; Sun, 19 Feb 2012 16:26:36 -0800 (PST) X-AuditID: 12074424-b7fae6d000000906-e3-4f41933b973a Received: from mailhub-auth-1.mit.edu ( [18.9.21.35]) by dmz-mailsec-scanner-7.mit.edu (Symantec Messaging Gateway) with SMTP id 93.22.02310.B33914F4; Sun, 19 Feb 2012 19:26:36 -0500 (EST) Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103]) by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id q1K0QZk9016451; Sun, 19 Feb 2012 19:26:35 -0500 Received: from drake.mit.edu (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com [209.6.116.242]) (authenticated bits=0) (User authenticated as amdragon@ATHENA.MIT.EDU) by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q1K0QYti000303 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT); Sun, 19 Feb 2012 19:26:35 -0500 (EST) Received: from amthrax by drake.mit.edu with local (Exim 4.77) (envelope-from ) id 1RzH5N-0001yR-U1; Sun, 19 Feb 2012 19:26:33 -0500 From: Austin Clements To: notmuch@notmuchmail.org Subject: [PATCH v2 6/8] show: Make JSON helper functions print complete objects Date: Sun, 19 Feb 2012 19:26:28 -0500 Message-Id: <1329697590-7404-7-git-send-email-amdragon@mit.edu> X-Mailer: git-send-email 1.7.7.3 In-Reply-To: <1329697590-7404-1-git-send-email-amdragon@mit.edu> References: <1329240823-7856-1-git-send-email-amdragon@mit.edu> <1329697590-7404-1-git-send-email-amdragon@mit.edu> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrDIsWRmVeSWpSXmKPExsUixCmqrGsz2dHfYP1MFovrN2cyW7xZOY/V gcnj8NeFLB7PVt1iDmCK4rJJSc3JLEst0rdL4Mo4uecBc8E0kYplOw+zNjDOFOhi5OSQEDCR uLJ5MROELSZx4d56ti5GLg4hgX2MEo3vr7CCJIQENjBKvPhpCJG4zySx+tB0dghnPqPEp4eH mUGq2AQ0JLbtX84IYosISEvsvDsbrJtZwEri8NVNYLawgL/E0UW3wWwWAVWJSxeOsIHYvAL2 Eu/Wv2SDOENB4tzqc0ALODg4BRwkVu9whTiiVOLIky1MExj5FzAyrGKUTcmt0s1NzMwpTk3W LU5OzMtLLdI118vNLNFLTSndxAgKJHYXlR2MzYeUDjEKcDAq8fBKljn4C7EmlhVX5h5ilORg UhLlXTfJ0V+ILyk/pTIjsTgjvqg0J7X4EKMEB7OSCO8Ce6Acb0piZVVqUT5MSpqDRUmcV0Pr nZ+QQHpiSWp2ampBahFMVoaDQ0mCdxfIUMGi1PTUirTMnBKENBMHJ8hwHqDhs0FqeIsLEnOL M9Mh8qcYFaXEeetBEgIgiYzSPLheWKS/YhQHekWYdwVIFQ8wScB1vwIazAQ0mFfIDmRwSSJC SqqBcYLd552RUQlbNZ+dNzlZXPNzg+sZ53cJ7bUbjpVVS1z4vFOu6bY2cyB35Z/PF9mdPga8 3Hjqluoph1ssHeHx6mf6v0w0jHrOWjrzdMrO78J+jj8k7mVzXE9WexirLV5y+fe7unm5Oqxx 209vnL4uw2COBI8Xx7rPC1q3OtTvfhGcMuPkR2dJLiWW4oxEQy3mouJEAAeZNQ3PAgAA Cc: tomi.ollila@iki.fi 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: Mon, 20 Feb 2012 00:26:41 -0000 This makes the main recursive function easier to follow because helper functions don't add fields to the running object. --- notmuch-show.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/notmuch-show.c b/notmuch-show.c index 6259d30..8fb6fa6 100644 --- a/notmuch-show.c +++ b/notmuch-show.c @@ -297,7 +297,7 @@ format_headers_json (const void *ctx, GMimeMessage *message) InternetAddressList *recipients; const char *recipients_string; - printf ("%s: %s", + printf ("{%s: %s", json_quote_str (local, "Subject"), json_quote_str (local, g_mime_message_get_subject (message))); printf (", %s: %s", @@ -315,7 +315,7 @@ format_headers_json (const void *ctx, GMimeMessage *message) printf (", %s: %s", json_quote_str (local, "Cc"), json_quote_str (local, recipients_string)); - printf (", %s: %s", + printf (", %s: %s}", json_quote_str (local, "Date"), json_quote_str (local, g_mime_message_get_date_as_string (message))); @@ -406,7 +406,7 @@ signer_status_to_string (GMimeSignerStatus x) static void format_part_sigstatus_json (GMimeSignatureList *siglist) { - printf (", \"sigstatus\": ["); + printf ("["); if (!siglist) { printf ("]"); @@ -472,7 +472,7 @@ format_part_sigstatus_json (GMimeSignatureList *siglist) static void format_part_sigstatus_json (const GMimeSignatureValidity* validity) { - printf (", \"sigstatus\": ["); + printf ("["); if (!validity) { printf ("]"); @@ -658,9 +658,8 @@ format_part_json (const void *ctx, mime_node_t *node, notmuch_bool_t first) printf ("{"); format_message_json (ctx, node->envelope_file); - printf ("\"headers\": {"); + printf ("\"headers\": "); format_headers_json (ctx, GMIME_MESSAGE (node->part)); - printf ("}"); printf (", \"body\": ["); format_part_json (ctx, mime_node_child (node, 0), first); @@ -696,6 +695,7 @@ format_part_json (const void *ctx, mime_node_t *node, notmuch_bool_t first) } if (node->verify_attempted) { + printf (", \"sigstatus\": "); #ifdef GMIME_ATLEAST_26 format_part_sigstatus_json (node->sig_list); #else @@ -746,9 +746,8 @@ format_part_json (const void *ctx, mime_node_t *node, notmuch_bool_t first) g_object_unref (stream_memory); if (GMIME_IS_MESSAGE (node->part)) { - printf ("\"headers\": {"); + printf ("\"headers\": "); format_headers_json (local, GMIME_MESSAGE (node->part)); - printf ("}"); printf (", \"body\": ["); } -- 1.7.7.3