1 Return-Path: <markwalters1009@gmail.com>
\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 E1C8E431FC3
\r
6 for <notmuch@notmuchmail.org>; Sun, 27 May 2012 01:22:39 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=0.201 tagged_above=-999 required=5
\r
12 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,
\r
13 FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001,
\r
14 RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
\r
15 Received: from olra.theworths.org ([127.0.0.1])
\r
16 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
17 with ESMTP id Op4Ol0r2IQX8 for <notmuch@notmuchmail.org>;
\r
18 Sun, 27 May 2012 01:22:38 -0700 (PDT)
\r
19 Received: from mail-wg0-f45.google.com (mail-wg0-f45.google.com
\r
20 [74.125.82.45]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client
\r
21 certificate requested) by olra.theworths.org (Postfix) with ESMTPS id
\r
22 795DA431FBD for <notmuch@notmuchmail.org>; Sun, 27 May 2012 01:22:36 -0700
\r
24 Received: by wgbdt14 with SMTP id dt14so1737676wgb.2
\r
25 for <notmuch@notmuchmail.org>; Sun, 27 May 2012 01:22:35 -0700 (PDT)
\r
26 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
\r
27 h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references;
\r
28 bh=mfd1W0o3Zq5XgbruG4RMp4PSq5smW6eg4We84NNSXOc=;
\r
29 b=wqeLm2fOK6iwrHf96bsRWN+h3FcEkRPNojIAxenAF9sOxVJ1dQamMthZJ6dlF7nDHl
\r
30 ZfWgpsnX07kW54zM7rsTMCEaSaepshuanepa4v8i4mcPfrMlZXBQg7KvDxVSJoOlKMr3
\r
31 ltUBjcay6MTmyrNJH5s5g4oabMqzwOIK7cjO8BiKlrtJ0mD6jFVf9VDL3+sZzYgeGmxc
\r
32 lb8gIy/8AOQ+MpT8lceZBQ5kppKV8UyENKCw8JD21ibuZN/qPAihvohqizbT3KF/o/We
\r
33 aJ9ZwgYJ+e41MwtGyQH4eSnbaPH2pRMv9Qu2wv4DFIGNDuVrn9fQGdZsHVMJBCJ/1h6t
\r
35 Received: by 10.180.80.97 with SMTP id q1mr7677845wix.13.1338106955317;
\r
36 Sun, 27 May 2012 01:22:35 -0700 (PDT)
\r
37 Received: from localhost (94-192-233-223.zone6.bethere.co.uk.
\r
38 [94.192.233.223]) by mx.google.com with ESMTPS id
\r
39 r2sm18149323wif.7.2012.05.27.01.22.33 (version=TLSv1/SSLv3 cipher=OTHER);
\r
40 Sun, 27 May 2012 01:22:34 -0700 (PDT)
\r
41 From: Mark Walters <markwalters1009@gmail.com>
\r
42 To: notmuch@notmuchmail.org
\r
43 Subject: [PATCH v6 2/6] cli: Let json output "null" messages for non
\r
45 Date: Sun, 27 May 2012 09:22:22 +0100
\r
46 Message-Id: <1338106946-7611-3-git-send-email-markwalters1009@gmail.com>
\r
47 X-Mailer: git-send-email 1.7.9.1
\r
48 In-Reply-To: <1338106946-7611-1-git-send-email-markwalters1009@gmail.com>
\r
49 References: <1338106946-7611-1-git-send-email-markwalters1009@gmail.com>
\r
50 X-BeenThere: notmuch@notmuchmail.org
\r
51 X-Mailman-Version: 2.1.13
\r
53 List-Id: "Use and development of the notmuch mail system."
\r
54 <notmuch.notmuchmail.org>
\r
55 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
56 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
57 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
58 List-Post: <mailto:notmuch@notmuchmail.org>
\r
59 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
60 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
61 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
62 X-List-Received-Date: Sun, 27 May 2012 08:22:40 -0000
\r
64 All formats except Json can output empty messages for non
\r
65 entire-thread, but in Json format we output "null" to keep the other
\r
66 elements (e.g. the replies to the omitted message) in the correct
\r
69 notmuch-client.h | 1 +
\r
70 notmuch-show.c | 20 ++++++++++++++++----
\r
71 2 files changed, 17 insertions(+), 4 deletions(-)
\r
73 diff --git a/notmuch-client.h b/notmuch-client.h
\r
74 index 19b7f01..08540a7 100644
\r
75 --- a/notmuch-client.h
\r
76 +++ b/notmuch-client.h
\r
77 @@ -72,6 +72,7 @@ typedef struct notmuch_show_format {
\r
78 const struct notmuch_show_params *params);
\r
79 const char *message_set_sep;
\r
80 const char *message_set_end;
\r
81 + const char *null_message;
\r
82 } notmuch_show_format_t;
\r
84 typedef struct notmuch_show_params {
\r
85 diff --git a/notmuch-show.c b/notmuch-show.c
\r
86 index 95427d4..97da5cc 100644
\r
87 --- a/notmuch-show.c
\r
88 +++ b/notmuch-show.c
\r
89 @@ -37,7 +37,8 @@ static const notmuch_show_format_t format_json = {
\r
90 .message_set_start = "[",
\r
91 .part = format_part_json_entry,
\r
92 .message_set_sep = ", ",
\r
93 - .message_set_end = "]"
\r
94 + .message_set_end = "]",
\r
95 + .null_message = "null"
\r
98 static notmuch_status_t
\r
99 @@ -800,6 +801,15 @@ format_part_raw (unused (const void *ctx), mime_node_t *node,
\r
102 static notmuch_status_t
\r
103 +show_null_message (const notmuch_show_format_t *format)
\r
105 + /* Output a null message. Currently empty for all formats except Json */
\r
106 + if (format->null_message)
\r
107 + printf ("%s", format->null_message);
\r
108 + return NOTMUCH_STATUS_SUCCESS;
\r
111 +static notmuch_status_t
\r
112 show_message (void *ctx,
\r
113 const notmuch_show_format_t *format,
\r
114 notmuch_message_t *message,
\r
115 @@ -862,11 +872,13 @@ show_messages (void *ctx,
\r
116 if (status && !res)
\r
118 next_indent = indent + 1;
\r
120 - if (!status && format->message_set_sep)
\r
121 - fputs (format->message_set_sep, stdout);
\r
123 + status = show_null_message (format);
\r
126 + if (!status && format->message_set_sep)
\r
127 + fputs (format->message_set_sep, stdout);
\r
129 status = show_messages (ctx,
\r
131 notmuch_message_get_replies (message),
\r