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 8ABA3429E31
\r
6 for <notmuch@notmuchmail.org>; Sun, 12 Feb 2012 02:35:03 -0800 (PST)
\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 U+n9vvoWfMga for <notmuch@notmuchmail.org>;
\r
18 Sun, 12 Feb 2012 02:35:02 -0800 (PST)
\r
19 Received: from mail-ww0-f45.google.com (mail-ww0-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 90832431FAE for <notmuch@notmuchmail.org>; Sun, 12 Feb 2012 02:35:02 -0800
\r
24 Received: by wgbdt12 with SMTP id dt12so3593006wgb.2
\r
25 for <notmuch@notmuchmail.org>; Sun, 12 Feb 2012 02:35:01 -0800 (PST)
\r
26 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;
\r
27 h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references;
\r
28 bh=F/EJAJwYr0fS3pkdQLdV87jd3pTYK2ch/AFp8FSwbqU=;
\r
29 b=GHePJu1emkWzkseQGVQbvvmBwA7jUvAih59iQ82IrI70Db2KCAxJ7PYigAP/y0jEUN
\r
30 hGyj5JsYokpsNAbrnjh0/U5a9Vk8gUad/UXxuNla3u0w8Wt3ZTbY+zAYOtR8IMkFAI3u
\r
31 nMWui64KlMFEKpSUH2w8cUWYzWK/r2uAWw/Zs=
\r
32 Received: by 10.180.107.2 with SMTP id gy2mr2540831wib.12.1329042901219;
\r
33 Sun, 12 Feb 2012 02:35:01 -0800 (PST)
\r
34 Received: from localhost (94-192-233-223.zone6.bethere.co.uk.
\r
35 [94.192.233.223]) by mx.google.com with ESMTPS id
\r
36 er8sm33487998wib.9.2012.02.12.02.34.59 (version=TLSv1/SSLv3 cipher=OTHER);
\r
37 Sun, 12 Feb 2012 02:35:00 -0800 (PST)
\r
38 From: Mark Walters <markwalters1009@gmail.com>
\r
39 To: notmuch@notmuchmail.org
\r
40 Subject: [RFC PATCH 1/3] cli: notmuch-show changes to support pick
\r
41 Date: Sun, 12 Feb 2012 10:36:03 +0000
\r
42 Message-Id: <1329042965-3871-1-git-send-email-markwalters1009@gmail.com>
\r
43 X-Mailer: git-send-email 1.7.2.3
\r
44 In-Reply-To: <87d39k1gvi.fsf@qmul.ac.uk>
\r
45 References: <87d39k1gvi.fsf@qmul.ac.uk>
\r
46 X-BeenThere: notmuch@notmuchmail.org
\r
47 X-Mailman-Version: 2.1.13
\r
49 List-Id: "Use and development of the notmuch mail system."
\r
50 <notmuch.notmuchmail.org>
\r
51 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
52 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
53 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
54 List-Post: <mailto:notmuch@notmuchmail.org>
\r
55 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
56 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
57 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
58 X-List-Received-Date: Sun, 12 Feb 2012 10:35:03 -0000
\r
61 notmuch-client.h | 9 +++++-
\r
62 notmuch-show.c | 90 ++++++++++++++++++++++++++++++++++++++++++++++++------
\r
63 2 files changed, 88 insertions(+), 11 deletions(-)
\r
65 diff --git a/notmuch-client.h b/notmuch-client.h
\r
66 index 60828aa..b4dc7bf 100644
\r
67 --- a/notmuch-client.h
\r
68 +++ b/notmuch-client.h
\r
69 @@ -97,10 +97,17 @@ typedef struct notmuch_show_format {
\r
70 const char *message_set_end;
\r
71 } notmuch_show_format_t;
\r
74 + NOTMUCH_SHOW_THREAD_MATCH,
\r
75 + NOTMUCH_SHOW_THREAD_ENTIRE,
\r
76 + NOTMUCH_SHOW_THREAD_NONE
\r
79 typedef struct notmuch_show_params {
\r
80 - notmuch_bool_t entire_thread;
\r
81 + int entire_thread;
\r
85 #ifdef GMIME_ATLEAST_26
\r
86 GMimeCryptoContext* cryptoctx;
\r
88 diff --git a/notmuch-show.c b/notmuch-show.c
\r
89 index c8fbd79..725d47d 100644
\r
90 --- a/notmuch-show.c
\r
91 +++ b/notmuch-show.c
\r
92 @@ -876,7 +876,7 @@ show_message (void *ctx,
\r
93 fputs (format->body_start, stdout);
\r
96 - if (format->part_content)
\r
97 + if (format->part_content && !params->headers_only)
\r
98 show_message_body (message, format, params);
\r
100 if (params->part <= 0) {
\r
101 @@ -923,11 +923,16 @@ show_messages (void *ctx,
\r
102 fputs (format->message_set_sep, stdout);
\r
105 - show_messages (ctx,
\r
107 - notmuch_message_get_replies (message),
\r
110 + if (params->entire_thread != NOTMUCH_SHOW_THREAD_NONE)
\r
111 + show_messages (ctx,
\r
113 + notmuch_message_get_replies (message),
\r
117 + fputs (format->message_set_start, stdout);
\r
118 + fputs (format->message_set_end, stdout);
\r
121 notmuch_message_destroy (message);
\r
123 @@ -937,6 +942,50 @@ show_messages (void *ctx,
\r
124 fputs (format->message_set_end, stdout);
\r
128 +do_show_messages (void *ctx,
\r
129 + notmuch_query_t *query,
\r
130 + const notmuch_show_format_t *format,
\r
131 + notmuch_show_params_t *params)
\r
133 + notmuch_messages_t *messages;
\r
134 + notmuch_message_t *message;
\r
135 + int first_set = 1;
\r
137 + fputs (format->message_set_start, stdout);
\r
138 + messages = notmuch_query_search_messages (query);
\r
141 + notmuch_messages_valid (messages);
\r
142 + notmuch_messages_move_to_next (messages))
\r
145 + fputs (format->message_set_sep, stdout);
\r
148 + fputs (format->message_set_start, stdout);
\r
149 + fputs (format->message_set_start, stdout);
\r
151 + message = notmuch_messages_get (messages);
\r
152 + notmuch_message_set_flag (message, NOTMUCH_MESSAGE_FLAG_MATCH, 1);
\r
153 + show_message (ctx, format, message, 0, params);
\r
155 + fputs (format->message_set_sep, stdout);
\r
157 + fputs (format->message_set_start, stdout);
\r
158 + fputs (format->message_set_end, stdout);
\r
161 + notmuch_message_destroy (message);
\r
163 + fputs (format->message_set_end, stdout);
\r
164 + fputs (format->message_set_end, stdout);
\r
167 + fputs (format->message_set_end, stdout);
\r
171 /* Formatted output of single message */
\r
173 do_show_single (void *ctx,
\r
174 @@ -1064,11 +1113,13 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))
\r
175 notmuch_database_t *notmuch;
\r
176 notmuch_query_t *query;
\r
177 char *query_string;
\r
178 - int opt_index, ret;
\r
179 + int opt_index, ret, entire_thread;
\r
180 + notmuch_sort_t sort = NOTMUCH_SORT_NEWEST_FIRST;
\r
181 const notmuch_show_format_t *format = &format_text;
\r
182 notmuch_show_params_t params = { .part = -1 };
\r
183 int format_sel = NOTMUCH_FORMAT_NOT_SPECIFIED;
\r
184 notmuch_bool_t verify = FALSE;
\r
185 + notmuch_bool_t headers_only = FALSE;
\r
187 notmuch_opt_desc_t options[] = {
\r
188 { NOTMUCH_OPT_KEYWORD, &format_sel, "format", 'f',
\r
189 @@ -1077,10 +1128,19 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))
\r
190 { "mbox", NOTMUCH_FORMAT_MBOX },
\r
191 { "raw", NOTMUCH_FORMAT_RAW },
\r
193 + { NOTMUCH_OPT_KEYWORD, &sort, "sort", 's',
\r
194 + (notmuch_keyword_t []){ { "oldest-first", NOTMUCH_SORT_OLDEST_FIRST },
\r
195 + { "newest-first", NOTMUCH_SORT_NEWEST_FIRST },
\r
197 { NOTMUCH_OPT_INT, ¶ms.part, "part", 'p', 0 },
\r
198 - { NOTMUCH_OPT_BOOLEAN, ¶ms.entire_thread, "entire-thread", 't', 0 },
\r
199 + { NOTMUCH_OPT_KEYWORD, &entire_thread, "thread", 't',
\r
200 + (notmuch_keyword_t []){ { "match", NOTMUCH_SHOW_THREAD_MATCH, },
\r
201 + { "entire", NOTMUCH_SHOW_THREAD_ENTIRE },
\r
202 + { "none", NOTMUCH_SHOW_THREAD_NONE },
\r
204 { NOTMUCH_OPT_BOOLEAN, ¶ms.decrypt, "decrypt", 'd', 0 },
\r
205 { NOTMUCH_OPT_BOOLEAN, &verify, "verify", 'v', 0 },
\r
206 + { NOTMUCH_OPT_BOOLEAN, &headers_only, "headers-only", 'h', 0 },
\r
210 @@ -1090,6 +1150,9 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))
\r
214 + params.entire_thread = entire_thread;
\r
215 + params.headers_only = headers_only;
\r
217 if (format_sel == NOTMUCH_FORMAT_NOT_SPECIFIED) {
\r
218 /* if part was requested and format was not specified, use format=raw */
\r
219 if (params.part >= 0)
\r
220 @@ -1101,7 +1164,9 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))
\r
221 switch (format_sel) {
\r
222 case NOTMUCH_FORMAT_JSON:
\r
223 format = &format_json;
\r
224 - params.entire_thread = TRUE;
\r
225 + if (!params.entire_thread) params.entire_thread = NOTMUCH_SHOW_THREAD_ENTIRE;
\r
226 + // params.entire_thread = 1;
\r
229 case NOTMUCH_FORMAT_TEXT:
\r
230 format = &format_text;
\r
231 @@ -1168,10 +1233,15 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))
\r
235 + notmuch_query_set_sort (query, sort);
\r
237 if (params.part >= 0)
\r
238 ret = do_show_single (ctx, query, format, ¶ms);
\r
240 - ret = do_show (ctx, query, format, ¶ms);
\r
241 + if (params.entire_thread == NOTMUCH_SHOW_THREAD_NONE)
\r
242 + ret = do_show_messages (ctx, query, format, ¶ms);
\r
244 + ret = do_show (ctx, query, format, ¶ms);
\r
246 notmuch_query_destroy (query);
\r
247 notmuch_database_close (notmuch);
\r