From 95dacff97a9908aefc7b023ddb0f870a3a2c18d6 Mon Sep 17 00:00:00 2001 From: Jani Nikula Date: Sun, 31 Mar 2013 12:46:00 +0300 Subject: [PATCH] [PATCH v3 3/6] cli: add --batch option to notmuch count --- c9/ad10df5c9e8ba49a7eda6479feabae5928212d | 175 ++++++++++++++++++++++ 1 file changed, 175 insertions(+) create mode 100644 c9/ad10df5c9e8ba49a7eda6479feabae5928212d diff --git a/c9/ad10df5c9e8ba49a7eda6479feabae5928212d b/c9/ad10df5c9e8ba49a7eda6479feabae5928212d new file mode 100644 index 000000000..7e85e551e --- /dev/null +++ b/c9/ad10df5c9e8ba49a7eda6479feabae5928212d @@ -0,0 +1,175 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 3B131429E26 + for ; Sun, 31 Mar 2013 02:46:20 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" +X-Spam-Flag: NO +X-Spam-Score: -0.7 +X-Spam-Level: +X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id mJukoyrQRl43 for ; + Sun, 31 Mar 2013 02:46:18 -0700 (PDT) +Received: from mail-lb0-f169.google.com (mail-lb0-f169.google.com + [209.85.217.169]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 7D501429E38 + for ; Sun, 31 Mar 2013 02:46:16 -0700 (PDT) +Received: by mail-lb0-f169.google.com with SMTP id p11so1257509lbi.0 + for ; Sun, 31 Mar 2013 02:46:15 -0700 (PDT) +X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=google.com; s=20120113; + h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to + :references:in-reply-to:references:x-gm-message-state; + bh=KYXmHV2QLnBerQFTXbjTzwVPfi2Z8+ml5yJ02DrCPjk=; + b=JK3aAIIOKXlZ3jwKF+rfn3eEJM9jrTXYihAs5bYt2bXZb0SehPqE5pKFVF1576B4+J + yrK3imoyHuWNlY9tpSfQNr04UAXqKsk4PCjdvovVfJGPoezlBLESJffggH9sjSotxo43 + PulKc3MlvB+craPmT4LQMhTIhNB+A37nokB7+bi6I7k66BzUO99HfFmTrT+I4bxRxUk4 + wi0gI1KU8RZ325qSzUwEC4cmv56S8Jg7HBd6CkQoPkXN0WZnt1McXo3IGonm5qHgN3Ui + AmecZpASH6fqb87x9mKvPZWbQ/CNx9RyYHtCXUu3dVQY42KctIR/gPsTftFhEijsg2lX + vEjQ== +X-Received: by 10.112.173.169 with SMTP id bl9mr3907050lbc.37.1364723174810; + Sun, 31 Mar 2013 02:46:14 -0700 (PDT) +Received: from localhost (dsl-hkibrasgw4-50df51-27.dhcp.inet.fi. + [80.223.81.27]) + by mx.google.com with ESMTPS id h7sm3706591lbp.16.2013.03.31.02.46.13 + (version=TLSv1.2 cipher=RC4-SHA bits=128/128); + Sun, 31 Mar 2013 02:46:14 -0700 (PDT) +From: Jani Nikula +To: notmuch@notmuchmail.org +Subject: [PATCH v3 3/6] cli: add --batch option to notmuch count +Date: Sun, 31 Mar 2013 12:46:00 +0300 +Message-Id: + <67dfaef373465f5a0d7426ae4839fbaf0df6ff7d.1364722841.git.jani@nikula.org> +X-Mailer: git-send-email 1.7.10.4 +In-Reply-To: +References: +In-Reply-To: +References: +X-Gm-Message-State: + ALoCoQnlGN0caz1ygIgF3RUBygSA209AfI6L9pVhl73I1Ofpgut45kcJVA3lDfMFV1ZoOFFb7uMz +Cc: Tomi Ollila +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Sun, 31 Mar 2013 09:46:20 -0000 + +Add support for reading queries from stdin, one per line, and writing +results to stdout, one per line. + +This will bring considerable performance improvements when utilized in +Emacs notmuch-hello, especially so when running remote notmuch. +--- + notmuch-count.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 50 insertions(+), 2 deletions(-) + +diff --git a/notmuch-count.c b/notmuch-count.c +index 630f036..8772cff 100644 +--- a/notmuch-count.c ++++ b/notmuch-count.c +@@ -62,6 +62,27 @@ print_count (notmuch_database_t *notmuch, const char *query_str, + return 0; + } + ++static int ++count_file (notmuch_database_t *notmuch, FILE *input, const char **exclude_tags, ++ size_t exclude_tags_length, int output) ++{ ++ char *line = NULL; ++ ssize_t line_len; ++ size_t line_size; ++ int ret = 0; ++ ++ while (!ret && (line_len = getline (&line, &line_size, input)) != -1) { ++ chomp_newline (line); ++ ret = print_count (notmuch, line, exclude_tags, exclude_tags_length, ++ output); ++ } ++ ++ if (line) ++ free (line); ++ ++ return ret; ++} ++ + int + notmuch_count_command (notmuch_config_t *config, int argc, char *argv[]) + { +@@ -72,6 +93,9 @@ notmuch_count_command (notmuch_config_t *config, int argc, char *argv[]) + int exclude = EXCLUDE_TRUE; + const char **search_exclude_tags = NULL; + size_t search_exclude_tags_length = 0; ++ notmuch_bool_t batch = FALSE; ++ FILE *input = stdin; ++ char *input_file_name = NULL; + int ret; + + notmuch_opt_desc_t options[] = { +@@ -83,6 +107,8 @@ notmuch_count_command (notmuch_config_t *config, int argc, char *argv[]) + (notmuch_keyword_t []){ { "true", EXCLUDE_TRUE }, + { "false", EXCLUDE_FALSE }, + { 0, 0 } } }, ++ { NOTMUCH_OPT_BOOLEAN, &batch, "batch", 0, 0 }, ++ { NOTMUCH_OPT_STRING, &input_file_name, "input", 'i', 0 }, + { 0, 0, 0, 0, 0 } + }; + +@@ -92,6 +118,21 @@ notmuch_count_command (notmuch_config_t *config, int argc, char *argv[]) + return 1; + } + ++ if (input_file_name) { ++ batch = TRUE; ++ input = fopen (input_file_name, "r"); ++ if (input == NULL) { ++ fprintf (stderr, "Error opening %s for reading: %s\n", ++ input_file_name, strerror (errno)); ++ return 1; ++ } ++ } ++ ++ if (batch && opt_index != argc) { ++ fprintf (stderr, "--batch and query string are not compatible\n"); ++ return 1; ++ } ++ + if (notmuch_database_open (notmuch_config_get_database_path (config), + NOTMUCH_DATABASE_MODE_READ_ONLY, ¬much)) + return 1; +@@ -107,10 +148,17 @@ notmuch_count_command (notmuch_config_t *config, int argc, char *argv[]) + (config, &search_exclude_tags_length); + } + +- ret = print_count (notmuch, query_str, search_exclude_tags, +- search_exclude_tags_length, output); ++ if (batch) ++ ret = count_file (notmuch, input, search_exclude_tags, ++ search_exclude_tags_length, output); ++ else ++ ret = print_count (notmuch, query_str, search_exclude_tags, ++ search_exclude_tags_length, output); + + notmuch_database_destroy (notmuch); + ++ if (input != stdin) ++ fclose (input); ++ + return ret; + } +-- +1.7.10.4 + -- 2.26.2