--- /dev/null
+Return-Path: <bremner@tethera.net>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by olra.theworths.org (Postfix) with ESMTP id 9413A431FB6\r
+ for <notmuch@notmuchmail.org>; Tue, 25 Dec 2012 11:43:24 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+ autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+ by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id 6sPBEtTP65H3 for <notmuch@notmuchmail.org>;\r
+ Tue, 25 Dec 2012 11:43:22 -0800 (PST)\r
+Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238])\r
+ (using TLSv1 with cipher AES256-SHA (256/256 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id 93078431E64\r
+ for <notmuch@notmuchmail.org>; Tue, 25 Dec 2012 11:43:11 -0800 (PST)\r
+Received: from fctnnbsc30w-156034082078.dhcp-dynamic.fibreop.nb.bellaliant.net\r
+ ([156.34.82.78] helo=zancas.localnet)\r
+ by tesseract.cs.unb.ca with esmtpsa\r
+ (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72)\r
+ (envelope-from <bremner@tethera.net>)\r
+ id 1TnaP8-0001iG-13; Tue, 25 Dec 2012 15:43:10 -0400\r
+Received: from bremner by zancas.localnet with local (Exim 4.80)\r
+ (envelope-from <bremner@tethera.net>)\r
+ id 1TnaP2-0005nD-Hc; Tue, 25 Dec 2012 15:43:04 -0400\r
+From: david@tethera.net\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 04/11] cli: add support for batch tagging operations to\r
+ "notmuch tag"\r
+Date: Tue, 25 Dec 2012 15:42:40 -0400\r
+Message-Id: <1356464567-21779-5-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.7.10.4\r
+In-Reply-To: <1356464567-21779-1-git-send-email-david@tethera.net>\r
+References: <1356464567-21779-1-git-send-email-david@tethera.net>\r
+X-Spam_bar: -\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Tue, 25 Dec 2012 19:43:25 -0000\r
+\r
+From: Jani Nikula <jani@nikula.org>\r
+\r
+Add support for batch tagging operations through stdin to "notmuch\r
+tag". This can be enabled with the new --batch command line option to\r
+"notmuch tag". The input must consist of lines of the format:\r
+\r
++<tag>|-<tag> [...] [--] <query> [...]\r
+\r
+Each line is interpreted similarly to "notmuch tag" command line\r
+arguments. The delimiter is one or more spaces ' '. Any characters in\r
+<tag> MAP be hex encoded with %NN where NN is the\r
+hexadecimal value of the character. Any ' ' and '%' characters in\r
+<tag> and <search-term> MUST be hex encoded (using %20 and %25,\r
+respectively). Any characters that are not part of <tag> or\r
+MUST NOT be hex encoded.\r
+\r
+<query> is passed verbatim to Xapian\r
+\r
+Leading and trailing space ' ' is ignored. Empty lines and lines\r
+beginning with '#' are ignored.\r
+\r
+Signed-off-by: Jani Nikula <jani@nikula.org>\r
+\r
+Hacked-like-crazy-by: David Bremner <david@tethera.net>\r
+---\r
+ notmuch-tag.c | 94 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----\r
+ 1 file changed, 86 insertions(+), 8 deletions(-)\r
+\r
+diff --git a/notmuch-tag.c b/notmuch-tag.c\r
+index 8129912..7fc614d 100644\r
+--- a/notmuch-tag.c\r
++++ b/notmuch-tag.c\r
+@@ -128,6 +128,46 @@ tag_query (void *ctx, notmuch_database_t *notmuch, const char *query_string,\r
+ return interrupted;\r
+ }\r
+ \r
++static int\r
++tag_file (void *ctx, notmuch_database_t *notmuch, tag_op_flag_t flags,\r
++ FILE *input)\r
++{\r
++ char *line = NULL;\r
++ char *query_string = NULL;\r
++ size_t line_size = 0;\r
++ ssize_t line_len;\r
++ int ret = 0;\r
++ tag_op_list_t *tag_ops;\r
++\r
++ tag_ops = tag_op_list_create (ctx);\r
++ if (tag_ops == NULL) {\r
++ fprintf (stderr, "Out of memory.\n");\r
++ return 1;\r
++ }\r
++\r
++ while ((line_len = getline (&line, &line_size, input)) != -1 &&\r
++ ! interrupted) {\r
++\r
++ ret = parse_tag_line (ctx, line, TAG_FLAG_NONE,\r
++ &query_string, tag_ops);\r
++\r
++ if (ret > 0)\r
++ continue;\r
++\r
++ if (ret < 0)\r
++ break;\r
++\r
++ ret = tag_query (ctx, notmuch, query_string, tag_ops, flags);\r
++ if (ret)\r
++ break;\r
++ }\r
++\r
++ if (line)\r
++ free (line);\r
++\r
++ return ret;\r
++}\r
++\r
+ int\r
+ notmuch_tag_command (void *ctx, int argc, char *argv[])\r
+ {\r
+@@ -137,6 +177,10 @@ notmuch_tag_command (void *ctx, int argc, char *argv[])\r
+ notmuch_database_t *notmuch;\r
+ struct sigaction action;\r
+ tag_op_flag_t tag_flags = TAG_FLAG_NONE;\r
++ notmuch_bool_t batch = FALSE;\r
++ FILE *input = stdin;\r
++ char *input_file_name = NULL;\r
++ int opt_index;\r
+ int ret = 0;\r
+ \r
+ /* Setup our handler for SIGINT */\r
+@@ -146,15 +190,43 @@ notmuch_tag_command (void *ctx, int argc, char *argv[])\r
+ action.sa_flags = SA_RESTART;\r
+ sigaction (SIGINT, &action, NULL);\r
+ \r
+- tag_ops = tag_op_list_create (ctx);\r
+- if (tag_ops == NULL) {\r
+- fprintf (stderr, "Out of memory.\n");\r
++ notmuch_opt_desc_t options[] = {\r
++ { NOTMUCH_OPT_BOOLEAN, &batch, "batch", 0, 0 },\r
++ { NOTMUCH_OPT_STRING, &input_file_name, "input", 'i', 0 },\r
++ { 0, 0, 0, 0, 0 }\r
++ };\r
++\r
++ opt_index = parse_arguments (argc, argv, options, 1);\r
++ if (opt_index < 0)\r
+ return 1;\r
++\r
++ if (input_file_name) {\r
++ batch = TRUE;\r
++ input = fopen (input_file_name, "r");\r
++ if (input == NULL) {\r
++ fprintf (stderr, "Error opening %s for reading: %s\n",\r
++ input_file_name, strerror (errno));\r
++ return 1;\r
++ }\r
+ }\r
+ \r
+- if (parse_tag_command_line (ctx, argc - 1, argv + 1,\r
+- &query_string, tag_ops))\r
+- return 1;\r
++ if (batch) {\r
++ if (opt_index != argc) {\r
++ fprintf (stderr, "Can't specify both cmdline and stdin!\n");\r
++ return 1;\r
++ }\r
++ } else {\r
++\r
++ tag_ops = tag_op_list_create (ctx);\r
++ if (tag_ops == NULL) {\r
++ fprintf (stderr, "Out of memory.\n");\r
++ return 1;\r
++ }\r
++\r
++ if (parse_tag_command_line (ctx, argc - opt_index, argv + opt_index,\r
++ &query_string, tag_ops))\r
++ return 1;\r
++ }\r
+ \r
+ config = notmuch_config_open (ctx, NULL, NULL);\r
+ if (config == NULL)\r
+@@ -167,9 +239,15 @@ notmuch_tag_command (void *ctx, int argc, char *argv[])\r
+ if (notmuch_config_get_maildir_synchronize_flags (config))\r
+ tag_flags |= TAG_FLAG_MAILDIR_SYNC;\r
+ \r
+- ret = tag_query (ctx, notmuch, query_string, tag_ops, tag_flags);\r
++ if (batch)\r
++ ret = tag_file (ctx, notmuch, tag_flags, input);\r
++ else\r
++ ret = tag_query (ctx, notmuch, query_string, tag_ops, tag_flags);\r
+ \r
+ notmuch_database_destroy (notmuch);\r
+ \r
+- return ret;\r
++ if (input != stdin)\r
++ fclose (input);\r
++\r
++ return ret || interrupted;\r
+ }\r
+-- \r
+1.7.10.4\r
+\r
projects / notmuch-archives.git / commitdiff