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 888A9431FAF
\r
6 for <notmuch@notmuchmail.org>; Wed, 18 Jan 2012 12:28:39 -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 xyxo88F5QHcj for <notmuch@notmuchmail.org>;
\r
16 Wed, 18 Jan 2012 12:28:38 -0800 (PST)
\r
17 Received: from dmz-mailsec-scanner-1.mit.edu (DMZ-MAILSEC-SCANNER-1.MIT.EDU
\r
19 by olra.theworths.org (Postfix) with ESMTP id 70F02431FAE
\r
20 for <notmuch@notmuchmail.org>; Wed, 18 Jan 2012 12:28:38 -0800 (PST)
\r
21 X-AuditID: 1209190c-b7fad6d000000920-a6-4f172b766725
\r
22 Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])
\r
23 by dmz-mailsec-scanner-1.mit.edu (Symantec Messaging Gateway) with SMTP
\r
24 id AB.19.02336.67B271F4; Wed, 18 Jan 2012 15:28:38 -0500 (EST)
\r
25 Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])
\r
26 by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id q0IKScUk025708;
\r
27 Wed, 18 Jan 2012 15:28:38 -0500
\r
28 Received: from drake.mit.edu (26-4-166.dynamic.csail.mit.edu [18.26.4.166])
\r
29 (authenticated bits=0)
\r
30 (User authenticated as amdragon@ATHENA.MIT.EDU)
\r
31 by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q0IKSarQ015678
\r
32 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);
\r
33 Wed, 18 Jan 2012 15:28:37 -0500 (EST)
\r
34 Received: from amthrax by drake.mit.edu with local (Exim 4.77)
\r
35 (envelope-from <amthrax@drake.mit.edu>)
\r
36 id 1Rnc7Y-0007QI-Nw; Wed, 18 Jan 2012 15:28:36 -0500
\r
37 From: Austin Clements <amdragon@MIT.EDU>
\r
38 To: notmuch@notmuchmail.org
\r
39 Subject: [PATCH 3/3] show: Introduce mime_node formatter callback
\r
40 Date: Wed, 18 Jan 2012 15:28:27 -0500
\r
41 Message-Id: <1326918507-28033-4-git-send-email-amdragon@mit.edu>
\r
42 X-Mailer: git-send-email 1.7.7.3
\r
43 In-Reply-To: <1326918507-28033-1-git-send-email-amdragon@mit.edu>
\r
44 References: <1326918507-28033-1-git-send-email-amdragon@mit.edu>
\r
45 X-Brightmail-Tracker:
\r
46 H4sIAAAAAAAAA+NgFrrBIsWRmVeSWpSXmKPExsUixCmqrFumLe5v8KBDwKK1+zOTxdWt/ewW
\r
47 TdOdLfbs87K4fnMmswOrx9nudlaPu6e5PHbOusvucev+a3aPZ6tuMQewRnHZpKTmZJalFunb
\r
48 JXBlrFk+l72gV6ri6Iwd7A2MK0S6GDk5JARMJI68n8IKYYtJXLi3nq2LkYtDSGAfo8TMnQ1M
\r
49 EM4GRolf1w+wQDjHmSQWfb/FDNIiJDCfUWJGRziIzSagIbFt/3JGEFtEQFpi593ZYGOZBWol
\r
50 Xv29wgZiCws4Srw6dAcsziKgKvFl3h+wObwCDhLdZ0AWgJyhIHFu9Tl2EJsTqP7N36+MELsc
\r
51 JNb+3Ms4gZF/ASPDKkbZlNwq3dzEzJzi1GTd4uTEvLzUIl1DvdzMEr3UlNJNjOAAlOTZwfjm
\r
52 oNIhRgEORiUe3ggRcX8h1sSy4srcQ4ySHExKorxVmkAhvqT8lMqMxOKM+KLSnNTiQ4wSHMxK
\r
53 Irxf+IByvCmJlVWpRfkwKWkOFiVxXhWtd35CAumJJanZqakFqUUwWRkODiUJ3jVaQI2CRanp
\r
54 qRVpmTklCGkmDk6Q4TxAw5eA1PAWFyTmFmemQ+RPMSpKifPyAGNcSAAkkVGaB9cLSxCvGMWB
\r
55 XhHmXQ7SzgNMLnDdr4AGMwEN9mgSAxlckoiQkmpgDPk1TeXfpH/fd2jI1+Ut03ugHq80n1F1
\r
56 WdLkj4Kq7K/+sDf6doc/zngv5v313mktpqqPpen7NBIs48VFGqt8jRtnF0+31M81OOUnU3z1
\r
57 Kpv/ph3Oj+R2nVapTjdnUbqdZPrcm33Rds6Tm2OL8+snKn3lYiquM7s1qczCY/oybr++pO3z
\r
58 fd4qsRRnJBpqMRcVJwIAeHJAE+sCAAA=
\r
59 Cc: dkg@fifthhorseman.net
\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: Wed, 18 Jan 2012 20:28:40 -0000
\r
74 This callback is the gateway to the new mime_node_t-based formatters.
\r
75 This maintains backwards compatibility so the formatters can be
\r
76 transitioned one at a time. Once all formatters are converted, the
\r
77 formatter structure can be reduced to only message_set_{start,sep,end}
\r
78 and part, most of show_message can be deleted, and all of
\r
79 show-message.c can be deleted.
\r
81 notmuch-client.h | 6 ++++++
\r
82 notmuch-reply.c | 2 +-
\r
83 notmuch-show.c | 22 ++++++++++++++++++----
\r
84 3 files changed, 25 insertions(+), 5 deletions(-)
\r
86 diff --git a/notmuch-client.h b/notmuch-client.h
\r
87 index b3dcb6b..3ccdfad 100644
\r
88 --- a/notmuch-client.h
\r
89 +++ b/notmuch-client.h
\r
91 #define STRINGIFY(s) STRINGIFY_(s)
\r
92 #define STRINGIFY_(s) #s
\r
95 +struct notmuch_show_params;
\r
97 typedef struct notmuch_show_format {
\r
98 const char *message_set_start;
\r
99 + void (*part) (const void *ctx,
\r
100 + struct mime_node *node, int indent,
\r
101 + struct notmuch_show_params *params);
\r
102 const char *message_start;
\r
103 void (*message) (const void *ctx,
\r
104 notmuch_message_t *message,
\r
105 diff --git a/notmuch-reply.c b/notmuch-reply.c
\r
106 index 0f682db..9a224e2 100644
\r
107 --- a/notmuch-reply.c
\r
108 +++ b/notmuch-reply.c
\r
109 @@ -31,7 +31,7 @@ static void
\r
110 reply_part_content (GMimeObject *part);
\r
112 static const notmuch_show_format_t format_reply = {
\r
116 "", NULL, reply_headers_message_part, ">\n",
\r
118 diff --git a/notmuch-show.c b/notmuch-show.c
\r
119 index ecadfa8..46eef44 100644
\r
120 --- a/notmuch-show.c
\r
121 +++ b/notmuch-show.c
\r
122 @@ -42,7 +42,7 @@ static void
\r
123 format_part_end_text (GMimeObject *part);
\r
125 static const notmuch_show_format_t format_text = {
\r
128 "\fmessage{ ", format_message_text,
\r
129 "\fheader{\n", format_headers_text, format_headers_message_part_text, "\fheader}\n",
\r
131 @@ -85,7 +85,7 @@ static void
\r
132 format_part_end_json (GMimeObject *part);
\r
134 static const notmuch_show_format_t format_json = {
\r
137 "{", format_message_json,
\r
138 "\"headers\": {", format_headers_json, format_headers_message_part_json, "}",
\r
140 @@ -106,7 +106,7 @@ format_message_mbox (const void *ctx,
\r
141 unused (int indent));
\r
143 static const notmuch_show_format_t format_mbox = {
\r
146 "", format_message_mbox,
\r
147 "", NULL, NULL, "",
\r
149 @@ -125,7 +125,7 @@ static void
\r
150 format_part_content_raw (GMimeObject *part);
\r
152 static const notmuch_show_format_t format_raw = {
\r
156 "", NULL, format_headers_message_part_text, "\n",
\r
158 @@ -762,6 +762,20 @@ show_message (void *ctx,
\r
160 notmuch_show_params_t *params)
\r
162 + if (format->part) {
\r
163 + void *local = talloc_new (ctx);
\r
164 + mime_node_t *root, *part;
\r
166 + if (mime_node_open (local, message, params->cryptoctx, params->decrypt,
\r
167 + &root) != NOTMUCH_STATUS_SUCCESS)
\r
169 + part = mime_node_seek_dfs (root, params->part < 0 ? 0 : params->part);
\r
171 + format->part (local, part, indent, params);
\r
172 + talloc_free (local);
\r
176 if (params->part <= 0) {
\r
177 fputs (format->message_start, stdout);
\r
178 if (format->message)
\r