1 Return-Path: <amthrax@drake.mit.edu>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id 8BFB7431FAF
\r
6 for <notmuch@notmuchmail.org>; Tue, 14 Feb 2012 09:34:07 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5
\r
12 tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id fxd-rCVUYPav for <notmuch@notmuchmail.org>;
\r
16 Tue, 14 Feb 2012 09:34:06 -0800 (PST)
\r
17 Received: from dmz-mailsec-scanner-3.mit.edu (DMZ-MAILSEC-SCANNER-3.MIT.EDU
\r
19 by olra.theworths.org (Postfix) with ESMTP id BFF5A429E36
\r
20 for <notmuch@notmuchmail.org>; Tue, 14 Feb 2012 09:34:01 -0800 (PST)
\r
21 X-AuditID: 1209190e-b7f7c6d0000008c3-69-4f3a9b09129f
\r
22 Received: from mailhub-auth-4.mit.edu ( [18.7.62.39])
\r
23 by dmz-mailsec-scanner-3.mit.edu (Symantec Messaging Gateway) with SMTP
\r
24 id 8D.1A.02243.90B9A3F4; Tue, 14 Feb 2012 12:34:01 -0500 (EST)
\r
25 Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])
\r
26 by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id q1EHY194019636;
\r
27 Tue, 14 Feb 2012 12:34:01 -0500
\r
28 Received: from drake.mit.edu
\r
29 (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com
\r
30 [209.6.116.242]) (authenticated bits=0)
\r
31 (User authenticated as amdragon@ATHENA.MIT.EDU)
\r
32 by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q1EHXxYj016521
\r
33 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);
\r
34 Tue, 14 Feb 2012 12:34:00 -0500 (EST)
\r
35 Received: from amthrax by drake.mit.edu with local (Exim 4.77)
\r
36 (envelope-from <amthrax@drake.mit.edu>)
\r
37 id 1RxMGN-00027P-B7; Tue, 14 Feb 2012 12:33:59 -0500
\r
38 From: Austin Clements <amdragon@MIT.EDU>
\r
39 To: notmuch@notmuchmail.org
\r
40 Subject: [PATCH 6/8] show: Make JSON helper functions print complete objects
\r
41 Date: Tue, 14 Feb 2012 12:33:41 -0500
\r
42 Message-Id: <1329240823-7856-7-git-send-email-amdragon@mit.edu>
\r
43 X-Mailer: git-send-email 1.7.7.3
\r
44 In-Reply-To: <1329240823-7856-1-git-send-email-amdragon@mit.edu>
\r
45 References: <1329240823-7856-1-git-send-email-amdragon@mit.edu>
\r
46 X-Brightmail-Tracker:
\r
47 H4sIAAAAAAAAA+NgFjrOIsWRmVeSWpSXmKPExsUixG6nrss528rf4OUiaYsje2axW1zd2s9u
\r
48 cf3mTGYHZo+ds+6yezxbdYvZo+nHYtYA5igum5TUnMyy1CJ9uwSujJN7HjAXTBOpWLbzMGsD
\r
49 40yBLkYODgkBE4nuJRxdjJxAppjEhXvr2boYuTiEBPYxSjzf3cMK4WxglDi39RJU5j6TxPqW
\r
50 ZVDOfEaJ9itzmUH62QQ0JLbtX84IYosISEvsvDubFcRmFoiXONK2HiwuLOAj8erFezCbRUBV
\r
51 4vGlM0wgNq+AvcTT84dYIe5QkDi3+hw7iM0p4CCxf99/sLgQUM2lu1tZJjDyL2BkWMUom5Jb
\r
52 pZubmJlTnJqsW5ycmJeXWqRrrJebWaKXmlK6iREUXpySfDsYvx5UOsQowMGoxMNrYGHpL8Sa
\r
53 WFZcmXuIUZKDSUmUV3iGlb8QX1J+SmVGYnFGfFFpTmrxIUYJDmYlEd5N04FyvCmJlVWpRfkw
\r
54 KWkOFiVxXjWtd35CAumJJanZqakFqUUwWRkODiUJ3qRZQI2CRanpqRVpmTklCGkmDk6Q4TxA
\r
55 w5NBaniLCxJzizPTIfKnGBWlxHk9QBICIImM0jy4Xlj8v2IUB3pFmDcIpIoHmDrgul8BDWYC
\r
56 Grz9tAXI4JJEhJRUA2OtmSf3k9D97spOisEim3pTGUsn6EzRbJff5JMbdEbMzO75vKZojaUv
\r
57 LzfMjF2xQrnhaJ6Ml64f477ET9/Ejj+QuHWlehfLnHl+4ttvm6w0amhPN+hWjb+ZmeQfdCO2
\r
58 NdM45p0UzyLB5S/DKzNdZl46X758qZVKkopZRG/KpafnjU0KTTxalFiKMxINtZiLihMBqjgL
\r
60 X-BeenThere: notmuch@notmuchmail.org
\r
61 X-Mailman-Version: 2.1.13
\r
63 List-Id: "Use and development of the notmuch mail system."
\r
64 <notmuch.notmuchmail.org>
\r
65 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
66 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
67 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
68 List-Post: <mailto:notmuch@notmuchmail.org>
\r
69 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
70 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
71 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
72 X-List-Received-Date: Tue, 14 Feb 2012 17:34:07 -0000
\r
74 This makes the main recursive function easier to follow because helper
\r
75 functions don't add fields to the running object.
\r
77 notmuch-show.c | 15 +++++++--------
\r
78 1 files changed, 7 insertions(+), 8 deletions(-)
\r
80 diff --git a/notmuch-show.c b/notmuch-show.c
\r
81 index 6259d30..8fb6fa6 100644
\r
82 --- a/notmuch-show.c
\r
83 +++ b/notmuch-show.c
\r
84 @@ -297,7 +297,7 @@ format_headers_json (const void *ctx, GMimeMessage *message)
\r
85 InternetAddressList *recipients;
\r
86 const char *recipients_string;
\r
89 + printf ("{%s: %s",
\r
90 json_quote_str (local, "Subject"),
\r
91 json_quote_str (local, g_mime_message_get_subject (message)));
\r
93 @@ -315,7 +315,7 @@ format_headers_json (const void *ctx, GMimeMessage *message)
\r
95 json_quote_str (local, "Cc"),
\r
96 json_quote_str (local, recipients_string));
\r
97 - printf (", %s: %s",
\r
98 + printf (", %s: %s}",
\r
99 json_quote_str (local, "Date"),
\r
100 json_quote_str (local, g_mime_message_get_date_as_string (message)));
\r
102 @@ -406,7 +406,7 @@ signer_status_to_string (GMimeSignerStatus x)
\r
104 format_part_sigstatus_json (GMimeSignatureList *siglist)
\r
106 - printf (", \"sigstatus\": [");
\r
111 @@ -472,7 +472,7 @@ format_part_sigstatus_json (GMimeSignatureList *siglist)
\r
113 format_part_sigstatus_json (const GMimeSignatureValidity* validity)
\r
115 - printf (", \"sigstatus\": [");
\r
120 @@ -658,9 +658,8 @@ format_part_json (const void *ctx, mime_node_t *node, notmuch_bool_t first)
\r
122 format_message_json (ctx, node->envelope_file);
\r
124 - printf ("\"headers\": {");
\r
125 + printf ("\"headers\": ");
\r
126 format_headers_json (ctx, GMIME_MESSAGE (node->part));
\r
129 printf (", \"body\": [");
\r
130 format_part_json (ctx, mime_node_child (node, 0), first);
\r
131 @@ -696,6 +695,7 @@ format_part_json (const void *ctx, mime_node_t *node, notmuch_bool_t first)
\r
134 if (node->verify_attempted) {
\r
135 + printf (", \"sigstatus\": ");
\r
136 #ifdef GMIME_ATLEAST_26
\r
137 format_part_sigstatus_json (node->sig_list);
\r
139 @@ -746,9 +746,8 @@ format_part_json (const void *ctx, mime_node_t *node, notmuch_bool_t first)
\r
140 g_object_unref (stream_memory);
\r
142 if (GMIME_IS_MESSAGE (node->part)) {
\r
143 - printf ("\"headers\": {");
\r
144 + printf ("\"headers\": ");
\r
145 format_headers_json (local, GMIME_MESSAGE (node->part));
\r
148 printf (", \"body\": [");
\r