From ac8d1bf00b9237faa38b004ea1c2b8e0c11add56 Mon Sep 17 00:00:00 2001 From: Austin Clements Date: Wed, 15 Feb 2012 12:33:41 +1900 Subject: [PATCH] [PATCH 6/8] show: Make JSON helper functions print complete objects --- 8b/ad9bb74cf0a07d50c1959f9df90f79644f71cb | 152 ++++++++++++++++++++++ 1 file changed, 152 insertions(+) create mode 100644 8b/ad9bb74cf0a07d50c1959f9df90f79644f71cb diff --git a/8b/ad9bb74cf0a07d50c1959f9df90f79644f71cb b/8b/ad9bb74cf0a07d50c1959f9df90f79644f71cb new file mode 100644 index 000000000..8cb18f578 --- /dev/null +++ b/8b/ad9bb74cf0a07d50c1959f9df90f79644f71cb @@ -0,0 +1,152 @@ +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 8BFB7431FAF + for ; Tue, 14 Feb 2012 09:34:07 -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 fxd-rCVUYPav for ; + Tue, 14 Feb 2012 09:34:06 -0800 (PST) +Received: from dmz-mailsec-scanner-3.mit.edu (DMZ-MAILSEC-SCANNER-3.MIT.EDU + [18.9.25.14]) + by olra.theworths.org (Postfix) with ESMTP id BFF5A429E36 + for ; Tue, 14 Feb 2012 09:34:01 -0800 (PST) +X-AuditID: 1209190e-b7f7c6d0000008c3-69-4f3a9b09129f +Received: from mailhub-auth-4.mit.edu ( [18.7.62.39]) + by dmz-mailsec-scanner-3.mit.edu (Symantec Messaging Gateway) with SMTP + id 8D.1A.02243.90B9A3F4; Tue, 14 Feb 2012 12:34:01 -0500 (EST) +Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103]) + by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id q1EHY194019636; + Tue, 14 Feb 2012 12:34:01 -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 q1EHXxYj016521 + (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT); + Tue, 14 Feb 2012 12:34:00 -0500 (EST) +Received: from amthrax by drake.mit.edu with local (Exim 4.77) + (envelope-from ) + id 1RxMGN-00027P-B7; Tue, 14 Feb 2012 12:33:59 -0500 +From: Austin Clements +To: notmuch@notmuchmail.org +Subject: [PATCH 6/8] show: Make JSON helper functions print complete objects +Date: Tue, 14 Feb 2012 12:33:41 -0500 +Message-Id: <1329240823-7856-7-git-send-email-amdragon@mit.edu> +X-Mailer: git-send-email 1.7.7.3 +In-Reply-To: <1329240823-7856-1-git-send-email-amdragon@mit.edu> +References: <1329240823-7856-1-git-send-email-amdragon@mit.edu> +X-Brightmail-Tracker: + H4sIAAAAAAAAA+NgFjrOIsWRmVeSWpSXmKPExsUixG6nrss528rf4OUiaYsje2axW1zd2s9u + cf3mTGYHZo+ds+6yezxbdYvZo+nHYtYA5igum5TUnMyy1CJ9uwSujJN7HjAXTBOpWLbzMGsD + 40yBLkYODgkBE4nuJRxdjJxAppjEhXvr2boYuTiEBPYxSjzf3cMK4WxglDi39RJU5j6TxPqW + ZVDOfEaJ9itzmUH62QQ0JLbtX84IYosISEvsvDubFcRmFoiXONK2HiwuLOAj8erFezCbRUBV + 4vGlM0wgNq+AvcTT84dYIe5QkDi3+hw7iM0p4CCxf99/sLgQUM2lu1tZJjDyL2BkWMUom5Jb + pZubmJlTnJqsW5ycmJeXWqRrrJebWaKXmlK6iREUXpySfDsYvx5UOsQowMGoxMNrYGHpL8Sa + WFZcmXuIUZKDSUmUV3iGlb8QX1J+SmVGYnFGfFFpTmrxIUYJDmYlEd5N04FyvCmJlVWpRfkw + KWkOFiVxXjWtd35CAumJJanZqakFqUUwWRkODiUJ3qRZQI2CRanpqRVpmTklCGkmDk6Q4TxA + w5NBaniLCxJzizPTIfKnGBWlxHk9QBICIImM0jy4Xlj8v2IUB3pFmDcIpIoHmDrgul8BDWYC + Grz9tAXI4JJEhJRUA2OtmSf3k9D97spOisEim3pTGUsn6EzRbJff5JMbdEbMzO75vKZojaUv + LzfMjF2xQrnhaJ6Ml64f477ET9/Ejj+QuHWlehfLnHl+4ttvm6w0amhPN+hWjb+ZmeQfdCO2 + NdM45p0UzyLB5S/DKzNdZl46X758qZVKkopZRG/KpafnjU0KTTxalFiKMxINtZiLihMBqjgL + E9oCAAA= +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: Tue, 14 Feb 2012 17:34:07 -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 + -- 2.26.2