[PATCH v2 3/6] cli: add --batch option to notmuch count

diff --git a/36/75a2711d8c3a93a59d7afcf97a20a6536dae88 b/36/75a2711d8c3a93a59d7afcf97a20a6536dae88
new file mode 100644 (file)
index 0000000..4bb729b
--- /dev/null
+++ b/36/75a2711d8c3a93a59d7afcf97a20a6536dae88
@@ -0,0 +1,174 @@
+Return-Path: <jani@nikula.org>\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 8FE20431FD2\r
+       for <notmuch@notmuchmail.org>; Sat,  9 Mar 2013 07:12:48 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References"\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 FkPO22usFL2s for <notmuch@notmuchmail.org>;\r
+       Sat,  9 Mar 2013 07:12:47 -0800 (PST)\r
+Received: from mail-la0-f48.google.com (mail-la0-f48.google.com\r
+       [209.85.215.48]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id D4298431FC9\r
+       for <notmuch@notmuchmail.org>; Sat,  9 Mar 2013 07:12:44 -0800 (PST)\r
+Received: by mail-la0-f48.google.com with SMTP id fq13so2568115lab.21\r
+       for <notmuch@notmuchmail.org>; Sat, 09 Mar 2013 07:12:43 -0800 (PST)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+       d=google.com; s=20120113;\r
+       h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to\r
+       :references:in-reply-to:references:x-gm-message-state;\r
+       bh=9A+71CoOyZaSFjWmtaMl0g0rmc+JXkDZca9xWkSmEFQ=;\r
+       b=MT90g4qR2EZfACQvddxh8mJNCnCgsSKqBLAfinbfUCm6NGRfq4CPYnvFBG2rtuihDf\r
+       IIpGdgLpgsZfnIdnTmPmLCZcSffJiURMOvGCuMbIZhvYNnxQR53LO+fOqnftSGf1TIEC\r
+       YhVLcRwlI6YNR7w2Xu22adStlm4kgchKB+O+KsAh/xif1tkIeTdl9IMana5hN4YrG4W5\r
+       A8LhszDNoLdeRGzfUBonwjVREKE7343bgf+IfxKpMGGl4thkiJEYBZyr7dXzzNI1VSrf\r
+       1MH+BU08hx+0NJGvTAbHSAoW44FZERAEjhEAp6l5CeikuWWS27j54XiMBwDl51NCyBrB\r
+       7Mng==\r
+X-Received: by 10.112.16.199 with SMTP id i7mr2418294lbd.65.1362841963195;\r
+       Sat, 09 Mar 2013 07:12:43 -0800 (PST)\r
+Received: from localhost (dsl-hkibrasgw4-50df51-27.dhcp.inet.fi.\r
+       [80.223.81.27])\r
+       by mx.google.com with ESMTPS id iq6sm4274815lab.10.2013.03.09.07.12.40\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Sat, 09 Mar 2013 07:12:42 -0800 (PST)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 3/6] cli: add --batch option to notmuch count\r
+Date: Sat,  9 Mar 2013 17:12:23 +0200\r
+Message-Id:\r
+ <d2a935b53c0e7c09bd7adb2515075d8d6c94e081.1362841844.git.jani@nikula.org>\r
+X-Mailer: git-send-email 1.7.10.4\r
+In-Reply-To: <cover.1362841844.git.jani@nikula.org>\r
+References: <cover.1362841844.git.jani@nikula.org>\r
+In-Reply-To: <cover.1362841844.git.jani@nikula.org>\r
+References: <cover.1362841844.git.jani@nikula.org>\r
+X-Gm-Message-State:\r
+ ALoCoQmi/y3DgnLZQ3esgkN+9Tq0Whs6kISCi1KhtNcg56ci5w25ko5sIDnHfMC1YEODjP0etJ7O\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: Sat, 09 Mar 2013 15:12:49 -0000\r
+\r
+Add support for reading queries from stdin, one per line, and writing\r
+results to stdin, one per line.\r
+\r
+This will bring considerable performance improvements when utilized in\r
+Emacs notmuch-hello, especially so when running remote notmuch.\r
+---\r
+ notmuch-count.c |   52 ++++++++++++++++++++++++++++++++++++++++++++++++++--\r
+ 1 file changed, 50 insertions(+), 2 deletions(-)\r
+\r
+diff --git a/notmuch-count.c b/notmuch-count.c\r
+index 630f036..8772cff 100644\r
+--- a/notmuch-count.c\r
++++ b/notmuch-count.c\r
+@@ -62,6 +62,27 @@ print_count (notmuch_database_t *notmuch, const char *query_str,\r
+     return 0;\r
+ }\r
+ \r
++static int\r
++count_file (notmuch_database_t *notmuch, FILE *input, const char **exclude_tags,\r
++          size_t exclude_tags_length, int output)\r
++{\r
++    char *line = NULL;\r
++    ssize_t line_len;\r
++    size_t line_size;\r
++    int ret = 0;\r
++\r
++    while (!ret && (line_len = getline (&line, &line_size, input)) != -1) {\r
++      chomp_newline (line);\r
++      ret = print_count (notmuch, line, exclude_tags, exclude_tags_length,\r
++                         output);\r
++    }\r
++\r
++    if (line)\r
++      free (line);\r
++\r
++    return ret;\r
++}\r
++\r
+ int\r
+ notmuch_count_command (notmuch_config_t *config, int argc, char *argv[])\r
+ {\r
+@@ -72,6 +93,9 @@ notmuch_count_command (notmuch_config_t *config, int argc, char *argv[])\r
+     int exclude = EXCLUDE_TRUE;\r
+     const char **search_exclude_tags = NULL;\r
+     size_t search_exclude_tags_length = 0;\r
++    notmuch_bool_t batch = FALSE;\r
++    FILE *input = stdin;\r
++    char *input_file_name = NULL;\r
+     int ret;\r
+ \r
+     notmuch_opt_desc_t options[] = {\r
+@@ -83,6 +107,8 @@ notmuch_count_command (notmuch_config_t *config, int argc, char *argv[])\r
+         (notmuch_keyword_t []){ { "true", EXCLUDE_TRUE },\r
+                                 { "false", EXCLUDE_FALSE },\r
+                                 { 0, 0 } } },\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
+@@ -92,6 +118,21 @@ notmuch_count_command (notmuch_config_t *config, int argc, char *argv[])\r
+       return 1;\r
+     }\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 (batch && opt_index != argc) {\r
++      fprintf (stderr, "--batch and query string are not compatible\n");\r
++      return 1;\r
++    }\r
++\r
+     if (notmuch_database_open (notmuch_config_get_database_path (config),\r
+                              NOTMUCH_DATABASE_MODE_READ_ONLY, &notmuch))\r
+       return 1;\r
+@@ -107,10 +148,17 @@ notmuch_count_command (notmuch_config_t *config, int argc, char *argv[])\r
+           (config, &search_exclude_tags_length);\r
+     }\r
+ \r
+-    ret = print_count (notmuch, query_str, search_exclude_tags,\r
+-                     search_exclude_tags_length, output);\r
++    if (batch)\r
++      ret = count_file (notmuch, input, search_exclude_tags,\r
++                        search_exclude_tags_length, output);\r
++    else\r
++      ret = print_count (notmuch, query_str, search_exclude_tags,\r
++                         search_exclude_tags_length, output);\r
+ \r
+     notmuch_database_destroy (notmuch);\r
+ \r
++    if (input != stdin)\r
++      fclose (input);\r
++\r
+     return ret;\r
+ }\r
+-- \r
+1.7.10.4\r
+\r