1 Return-Path: <bremner@tethera.net>
\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 805CA431FC2
\r
6 for <notmuch@notmuchmail.org>; Fri, 21 Dec 2012 05:08:53 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
\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 HRaYQ+glJfKL for <notmuch@notmuchmail.org>;
\r
16 Fri, 21 Dec 2012 05:08:51 -0800 (PST)
\r
17 Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238])
\r
18 (using TLSv1 with cipher AES256-SHA (256/256 bits))
\r
19 (No client certificate requested)
\r
20 by olra.theworths.org (Postfix) with ESMTPS id C66B0431FDC
\r
21 for <notmuch@notmuchmail.org>; Fri, 21 Dec 2012 05:08:40 -0800 (PST)
\r
22 Received: from fctnnbsc30w-156034082078.dhcp-dynamic.fibreop.nb.bellaliant.net
\r
23 ([156.34.82.78] helo=zancas.localnet)
\r
24 by tesseract.cs.unb.ca with esmtpsa
\r
25 (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72)
\r
26 (envelope-from <bremner@tethera.net>)
\r
27 id 1Tm2L7-0005df-3a; Fri, 21 Dec 2012 09:08:37 -0400
\r
28 Received: from bremner by zancas.localnet with local (Exim 4.80)
\r
29 (envelope-from <bremner@tethera.net>)
\r
30 id 1Tm2L1-0005yr-L7; Fri, 21 Dec 2012 09:08:31 -0400
\r
31 From: david@tethera.net
\r
32 To: notmuch@notmuchmail.org
\r
33 Subject: [Patch v8 09/18] cli: add support for batch tagging operations to
\r
35 Date: Fri, 21 Dec 2012 09:08:18 -0400
\r
36 Message-Id: <1356095307-22895-9-git-send-email-david@tethera.net>
\r
37 X-Mailer: git-send-email 1.7.10.4
\r
38 In-Reply-To: <1356095307-22895-1-git-send-email-david@tethera.net>
\r
39 References: <1356095307-22895-1-git-send-email-david@tethera.net>
\r
41 X-BeenThere: notmuch@notmuchmail.org
\r
42 X-Mailman-Version: 2.1.13
\r
44 List-Id: "Use and development of the notmuch mail system."
\r
45 <notmuch.notmuchmail.org>
\r
46 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
47 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
48 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
49 List-Post: <mailto:notmuch@notmuchmail.org>
\r
50 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
51 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
52 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
53 X-List-Received-Date: Fri, 21 Dec 2012 13:08:53 -0000
\r
55 From: Jani Nikula <jani@nikula.org>
\r
57 Add support for batch tagging operations through stdin to "notmuch
\r
58 tag". This can be enabled with the new --batch command line option to
\r
59 "notmuch tag". The input must consist of lines of the format:
\r
61 +<tag>|-<tag> [...] [--] <search-term> [...]
\r
63 Each line is interpreted similarly to "notmuch tag" command line
\r
64 arguments. The delimiter is one or more spaces ' '. Any characters in
\r
65 <tag> and <search-term> MAY be hex encoded with %NN where NN is the
\r
66 hexadecimal value of the character. Any ' ' and '%' characters in
\r
67 <tag> and <search-term> MUST be hex encoded (using %20 and %25,
\r
68 respectively). Any characters that are not part of <tag> or
\r
69 <search-term> MUST NOT be hex encoded.
\r
71 Leading and trailing space ' ' is ignored. Empty lines and lines
\r
72 beginning with '#' are ignored.
\r
74 Signed-off-by: Jani Nikula <jani@nikula.org>
\r
76 Hacked-like-crazy-by: David Bremner <david@tethera.net>
\r
78 notmuch-tag.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
\r
79 1 file changed, 83 insertions(+), 8 deletions(-)
\r
81 diff --git a/notmuch-tag.c b/notmuch-tag.c
\r
82 index a480215..5c8bad4 100644
\r
85 @@ -132,6 +132,46 @@ tag_query (void *ctx, notmuch_database_t *notmuch, const char *query_string,
\r
90 +tag_file (void *ctx, notmuch_database_t *notmuch, tag_op_flag_t flags,
\r
93 + char *line = NULL;
\r
94 + char *query_string = NULL;
\r
95 + size_t line_size = 0;
\r
98 + tag_op_list_t *tag_ops;
\r
100 + tag_ops = tag_op_list_create (ctx);
\r
101 + if (tag_ops == NULL) {
\r
102 + fprintf (stderr, "Out of memory.\n");
\r
106 + while ((line_len = getline (&line, &line_size, input)) != -1 &&
\r
109 + ret = parse_tag_line (ctx, line, TAG_FLAG_NONE,
\r
110 + &query_string, tag_ops);
\r
118 + ret = tag_query (ctx, notmuch, query_string, tag_ops, flags);
\r
130 notmuch_tag_command (void *ctx, int argc, char *argv[])
\r
132 @@ -141,6 +181,10 @@ notmuch_tag_command (void *ctx, int argc, char *argv[])
\r
133 notmuch_database_t *notmuch;
\r
134 struct sigaction action;
\r
135 tag_op_flag_t tag_flags = TAG_FLAG_NONE;
\r
136 + notmuch_bool_t batch = FALSE;
\r
137 + FILE *input = stdin;
\r
138 + char *input_file_name = NULL;
\r
142 /* Setup our handler for SIGINT */
\r
143 @@ -150,15 +194,43 @@ notmuch_tag_command (void *ctx, int argc, char *argv[])
\r
144 action.sa_flags = SA_RESTART;
\r
145 sigaction (SIGINT, &action, NULL);
\r
147 - tag_ops = tag_op_list_create (ctx);
\r
148 - if (tag_ops == NULL) {
\r
149 - fprintf (stderr, "Out of memory.\n");
\r
150 + notmuch_opt_desc_t options[] = {
\r
151 + { NOTMUCH_OPT_BOOLEAN, &batch, "batch", 0, 0 },
\r
152 + { NOTMUCH_OPT_STRING, &input_file_name, "input", 'i', 0 },
\r
153 + { 0, 0, 0, 0, 0 }
\r
156 + opt_index = parse_arguments (argc, argv, options, 1);
\r
157 + if (opt_index < 0)
\r
160 + if (input_file_name) {
\r
162 + input = fopen (input_file_name, "r");
\r
163 + if (input == NULL) {
\r
164 + fprintf (stderr, "Error opening %s for reading: %s\n",
\r
165 + input_file_name, strerror (errno));
\r
170 - if (parse_tag_command_line (ctx, argc - 1, argv + 1,
\r
171 - &query_string, tag_ops))
\r
174 + if (opt_index != argc) {
\r
175 + fprintf (stderr, "Can't specify both cmdline and stdin!\n");
\r
180 + tag_ops = tag_op_list_create (ctx);
\r
181 + if (tag_ops == NULL) {
\r
182 + fprintf (stderr, "Out of memory.\n");
\r
186 + if (parse_tag_command_line (ctx, argc - opt_index, argv + opt_index,
\r
187 + &query_string, tag_ops))
\r
191 config = notmuch_config_open (ctx, NULL, NULL);
\r
192 if (config == NULL)
\r
193 @@ -171,9 +243,12 @@ notmuch_tag_command (void *ctx, int argc, char *argv[])
\r
194 if (notmuch_config_get_maildir_synchronize_flags (config))
\r
195 tag_flags |= TAG_FLAG_MAILDIR_SYNC;
\r
197 - ret = tag_query (ctx, notmuch, query_string, tag_ops, tag_flags);
\r
199 + ret = tag_file (ctx, notmuch, tag_flags, input);
\r
201 + ret = tag_query (ctx, notmuch, query_string, tag_ops, tag_flags);
\r
203 notmuch_database_destroy (notmuch);
\r
206 + return ret || interrupted;
\r