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 30614429E42
\r
6 for <notmuch@notmuchmail.org>; Tue, 14 Feb 2012 09:34:10 -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 Xm280smBX2no for <notmuch@notmuchmail.org>;
\r
16 Tue, 14 Feb 2012 09:34:08 -0800 (PST)
\r
17 Received: from dmz-mailsec-scanner-4.mit.edu (DMZ-MAILSEC-SCANNER-4.MIT.EDU
\r
19 by olra.theworths.org (Postfix) with ESMTP id 7EAB7429E31
\r
20 for <notmuch@notmuchmail.org>; Tue, 14 Feb 2012 09:34:03 -0800 (PST)
\r
21 X-AuditID: 1209190f-b7f8a6d000000914-14-4f3a9b0ae7c6
\r
22 Received: from mailhub-auth-4.mit.edu ( [18.7.62.39])
\r
23 by dmz-mailsec-scanner-4.mit.edu (Symantec Messaging Gateway) with SMTP
\r
24 id 4B.5C.02324.A0B9A3F4; Tue, 14 Feb 2012 12:34:02 -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 q1EHY2Ou019643;
\r
27 Tue, 14 Feb 2012 12:34:02 -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 q1EHY1wh016531
\r
33 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);
\r
34 Tue, 14 Feb 2012 12:34:02 -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 1RxMGO-00027Y-SC; Tue, 14 Feb 2012 12:34:00 -0500
\r
38 From: Austin Clements <amdragon@MIT.EDU>
\r
39 To: notmuch@notmuchmail.org
\r
40 Subject: [PATCH 8/8] show: Further general simplifications of the JSON
\r
42 Date: Tue, 14 Feb 2012 12:33:43 -0500
\r
43 Message-Id: <1329240823-7856-9-git-send-email-amdragon@mit.edu>
\r
44 X-Mailer: git-send-email 1.7.7.3
\r
45 In-Reply-To: <1329240823-7856-1-git-send-email-amdragon@mit.edu>
\r
46 References: <1329240823-7856-1-git-send-email-amdragon@mit.edu>
\r
47 X-Brightmail-Tracker:
\r
48 H4sIAAAAAAAAA+NgFjrBIsWRmVeSWpSXmKPExsUixG6nrss128rfoP2uhcWRPbPYLa5u7We3
\r
49 uH5zJrMDs8fOWXfZPZ6tusXs0fRjMWsAcxSXTUpqTmZZapG+XQJXxtv2mywFcxUr/k/cyNLA
\r
50 eESqi5GTQ0LAROL91/UsELaYxIV769m6GLk4hAT2MUq8f7ycCcLZwChxeN06qMx9JomL6zsZ
\r
51 IZz5jBJnb68C62cT0JDYtn85I4gtIiAtsfPubFYQm1kgXuJI23qwuLBAgMSz1jZ2EJtFQFXi
\r
52 +IslTCA2r4C9xJKp7awQdyhInFt9DqyGU8BBYv++/2BxIaCaS3e3skxg5F/AyLCKUTYlt0o3
\r
53 NzEzpzg1Wbc4OTEvL7VI10QvN7NELzWldBMjKMA4Jfl3MH47qHSIUYCDUYmH18DC0l+INbGs
\r
54 uDL3EKMkB5OSKK/wDCt/Ib6k/JTKjMTijPii0pzU4kOMEhzMSiK8m6YD5XhTEiurUovyYVLS
\r
55 HCxK4rxqWu/8hATSE0tSs1NTC1KLYLIyHBxKErzds4AaBYtS01Mr0jJzShDSTBycIMN5gIa3
\r
56 gNTwFhck5hZnpkPkTzEqSonzeoAkBEASGaV5cL2wBPCKURzoFWHeCSBVPMDkAdf9CmgwE9Dg
\r
57 7actQAaXJCKkpBoYu6pcTbzKSiwt9DK1WL5Xb/gku5rBQPhasKdjybmv53J+mJ/1qJjdxW/k
\r
58 Ufd8zR//bLZCM6tNjWECM5p51n6ck37A7k/6Bw5PY32zjd1zDl/cd2/RtM0esm+DXnOoRks+
\r
59 uxA6R/sK30bus6qdlkK+alekJgTozX+zdmOitHrG8TWCYmtPad1VYinOSDTUYi4qTgQAZYnO
\r
61 X-BeenThere: notmuch@notmuchmail.org
\r
62 X-Mailman-Version: 2.1.13
\r
64 List-Id: "Use and development of the notmuch mail system."
\r
65 <notmuch.notmuchmail.org>
\r
66 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
67 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
68 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
69 List-Post: <mailto:notmuch@notmuchmail.org>
\r
70 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
71 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
72 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
73 X-List-Received-Date: Tue, 14 Feb 2012 17:34:10 -0000
\r
76 notmuch-show.c | 61 ++++++++++++++++++++-----------------------------------
\r
77 1 files changed, 22 insertions(+), 39 deletions(-)
\r
79 diff --git a/notmuch-show.c b/notmuch-show.c
\r
80 index 07276c7..6a171a4 100644
\r
81 --- a/notmuch-show.c
\r
82 +++ b/notmuch-show.c
\r
83 @@ -678,9 +678,10 @@ format_part_json (const void *ctx, mime_node_t *node, notmuch_bool_t first)
\r
84 GMimeObject *meta = node->envelope_part ?
\r
85 GMIME_OBJECT (node->envelope_part) : node->part;
\r
86 GMimeContentType *content_type = g_mime_object_get_content_type (meta);
\r
87 - GMimeStream *stream_memory = g_mime_stream_mem_new ();
\r
88 const char *cid = g_mime_object_get_content_id (meta);
\r
89 - GByteArray *part_content;
\r
90 + const char *filename = GMIME_IS_PART (node->part) ?
\r
91 + g_mime_part_get_filename (GMIME_PART (node->part)) : NULL;
\r
92 + const char *terminator = "";
\r
96 @@ -688,15 +689,9 @@ format_part_json (const void *ctx, mime_node_t *node, notmuch_bool_t first)
\r
98 printf ("{\"id\": %d", node->part_num);
\r
100 - if (node->decrypt_attempted) {
\r
101 - printf (", \"encstatus\": [{\"status\": ");
\r
102 - if (node->decrypt_success) {
\r
103 - printf ("\"good\"");
\r
105 - printf ("\"bad\"");
\r
109 + if (node->decrypt_attempted)
\r
110 + printf (", \"encstatus\": [{\"status\": \"%s\"}]",
\r
111 + node->decrypt_success ? "good" : "bad");
\r
113 if (node->verify_attempted) {
\r
114 printf (", \"sigstatus\": ");
\r
115 @@ -706,16 +701,13 @@ format_part_json (const void *ctx, mime_node_t *node, notmuch_bool_t first)
\r
116 printf (", \"content-type\": %s",
\r
117 json_quote_str (local, g_mime_content_type_to_string (content_type)));
\r
120 - printf(", \"content-id\": %s", json_quote_str (local, cid));
\r
122 + printf (", \"content-id\": %s", json_quote_str (local, cid));
\r
125 + printf (", \"filename\": %s", json_quote_str (local, filename));
\r
127 if (GMIME_IS_PART (node->part)) {
\r
128 - const char *filename = g_mime_part_get_filename (GMIME_PART (node->part));
\r
130 - printf (", \"filename\": %s", json_quote_str (local, filename));
\r
133 - if (g_mime_content_type_is_type (content_type, "text", "*")) {
\r
134 /* For non-HTML text parts, we include the content in the
\r
135 * JSON. Since JSON must be Unicode, we handle charset
\r
136 * decoding here and do not report a charset to the caller.
\r
137 @@ -730,42 +722,33 @@ format_part_json (const void *ctx, mime_node_t *node, notmuch_bool_t first)
\r
139 if (content_charset != NULL)
\r
140 printf (", \"content-charset\": %s", json_quote_str (local, content_charset));
\r
142 + } else if (g_mime_content_type_is_type (content_type, "text", "*")) {
\r
143 + GMimeStream *stream_memory = g_mime_stream_mem_new ();
\r
144 + GByteArray *part_content;
\r
145 show_text_part_content (node->part, stream_memory);
\r
146 part_content = g_mime_stream_mem_get_byte_array (GMIME_STREAM_MEM (stream_memory));
\r
148 printf (", \"content\": %s", json_quote_chararray (local, (char *) part_content->data, part_content->len));
\r
149 + g_object_unref (stream_memory);
\r
151 - } else if (g_mime_content_type_is_type (content_type, "multipart", "*")) {
\r
152 + } else if (GMIME_IS_MULTIPART (node->part)) {
\r
153 printf (", \"content\": [");
\r
154 - } else if (g_mime_content_type_is_type (content_type, "message", "rfc822")) {
\r
155 + terminator = "]";
\r
156 + } else if (GMIME_IS_MESSAGE (node->part)) {
\r
157 printf (", \"content\": [{");
\r
160 - if (stream_memory)
\r
161 - g_object_unref (stream_memory);
\r
163 - if (GMIME_IS_MESSAGE (node->part)) {
\r
164 printf ("\"headers\": ");
\r
165 format_headers_json (local, GMIME_MESSAGE (node->part));
\r
167 printf (", \"body\": [");
\r
168 + terminator = "]}]";
\r
171 + talloc_free (local);
\r
173 for (i = 0; i < node->nchildren; i++)
\r
174 format_part_json (ctx, mime_node_child (node, i), i == 0);
\r
176 - if (GMIME_IS_MESSAGE (node->part))
\r
179 - if (g_mime_content_type_is_type (content_type, "multipart", "*"))
\r
181 - else if (g_mime_content_type_is_type (content_type, "message", "rfc822"))
\r
186 - talloc_free (local);
\r
187 + printf ("%s}", terminator);
\r