From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id A521B431FBC for ; Sat, 15 Dec 2012 15:14:17 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org 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 RL+MdqzoNBZC for ; Sat, 15 Dec 2012 15:14:17 -0800 (PST) Received: from mail-lb0-f181.google.com (mail-lb0-f181.google.com [209.85.217.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id A57DE431FB6 for ; Sat, 15 Dec 2012 15:14:16 -0800 (PST) Received: by mail-lb0-f181.google.com with SMTP id ge1so3675627lbb.26 for ; Sat, 15 Dec 2012 15:14:15 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:subject:in-reply-to:references:user-agent:date:message-id :mime-version:content-type:x-gm-message-state; bh=PhiNTEsdr4naal0JV8ExT3nNl7g6gnMPKbDojI8wv7c=; b=KDmMeVMDHTyaNVM04V4s13ImiE8ZBxA4Z7C/1aQULQNeOGlkehAkB+GOjA9jLl6o19 7ix1Mp8u0eX0J4idC2XYly4SgcjLcT8oZ4T9aLsP2NI0Y397qPr7oYDCz+imLyfvszyC eAN+ZKXcHGVCbV4SfWTsVnC2ejSo8zxElrN//+Xq/dwwY4+SYD9Q+uKradGhIdylj/8B Qtmqm8EuUYGACaI/CN37ISkOChQT6Xtd34l5Y9wGKm3Ax5s1lz411wakxH2TGZfXyhEo LGqKNUsZJTccOinBeqrdZ136blev8HxQQ1AOSX2QeIL0GwPYLQXgS63iyLw+UB4d99Ot vRBQ== Received: by 10.152.114.65 with SMTP id je1mr6630159lab.33.1355613255147; Sat, 15 Dec 2012 15:14:15 -0800 (PST) Received: from localhost (dsl-hkibrasgw4-50df51-27.dhcp.inet.fi. [80.223.81.27]) by mx.google.com with ESMTPS id lr20sm3225480lab.17.2012.12.15.15.14.13 (version=SSLv3 cipher=OTHER); Sat, 15 Dec 2012 15:14:14 -0800 (PST) From: Jani Nikula To: david@tethera.net, notmuch@notmuchmail.org Subject: Re: [Patch v7 07/14] cli: add support for batch tagging operations to "notmuch tag" In-Reply-To: <1355492062-7546-8-git-send-email-david@tethera.net> References: <1355492062-7546-1-git-send-email-david@tethera.net> <1355492062-7546-8-git-send-email-david@tethera.net> User-Agent: Notmuch/0.14+138~g7041c56 (http://notmuchmail.org) Emacs/23.4.1 (i686-pc-linux-gnu) Date: Sun, 16 Dec 2012 01:14:07 +0200 Message-ID: <87pq2aq56o.fsf@nikula.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Gm-Message-State: ALoCoQnEbHTUS7B7ijZOL03mGMXk9vQtvw0xvZDKQ34XtdejnlG2hO7IiPnGbqrY+xJb3wLuvdQ5 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: Sat, 15 Dec 2012 23:14:17 -0000 On Fri, 14 Dec 2012, david@tethera.net wrote: > From: Jani Nikula > > Add support for batch tagging operations through stdin to "notmuch > tag". This can be enabled with the new --batch command line option to > "notmuch tag". The input must consist of lines of the format: > > +|- [...] [--] [...] > > Each line is interpreted similarly to "notmuch tag" command line > arguments. The delimiter is one or more spaces ' '. Any characters in > and MAY be hex encoded with %NN where NN is the > hexadecimal value of the character. Any ' ' and '%' characters in > and MUST be hex encoded (using %20 and %25, > respectively). Any characters that are not part of or > MUST NOT be hex encoded. > > Leading and trailing space ' ' is ignored. Empty lines and lines > beginning with '#' are ignored. > > Signed-off-by: Jani Nikula > > Hacked-like-crazy-by: David Bremner > --- > notmuch-tag.c | 88 +++++++++++++++++++++++++++++++++++++++++++++++++++------ > 1 file changed, 80 insertions(+), 8 deletions(-) > > diff --git a/notmuch-tag.c b/notmuch-tag.c > index 13f2268..a81d911 100644 > --- a/notmuch-tag.c > +++ b/notmuch-tag.c > @@ -130,6 +130,43 @@ tag_query (void *ctx, notmuch_database_t *notmuch, const char *query_string, > return interrupted; > } > > +static int > +tag_file (void *ctx, notmuch_database_t *notmuch, tag_op_flag_t flags, > + FILE *input) > +{ > + char *line = NULL; > + char *query_string = NULL; > + size_t line_size = 0; > + ssize_t line_len; > + int ret = 0; > + tag_op_list_t *tag_ops; > + > + tag_ops = tag_op_list_create (ctx); > + if (tag_ops == NULL) { > + fprintf (stderr, "Out of memory.\n"); > + return 1; > + } > + > + while ((line_len = getline (&line, &line_size, input)) != -1 && > + ! interrupted) { > + > + ret = parse_tag_line (ctx, line, TAG_FLAG_NONE, > + &query_string, tag_ops); > + > + if (ret > 0) > + continue; > + > + if (ret < 0 || tag_query (ctx, notmuch, query_string, > + tag_ops, flags)) > + break; Hey, your changelog in the cover letter says you fixed the tag_query return value propagation, but it's not here? BR, Jani. > + } > + > + if (line) > + free (line); > + > + return ret; > +} > + > int > notmuch_tag_command (void *ctx, int argc, char *argv[]) > { > @@ -139,6 +176,10 @@ notmuch_tag_command (void *ctx, int argc, char *argv[]) > notmuch_database_t *notmuch; > struct sigaction action; > tag_op_flag_t tag_flags = TAG_FLAG_NONE; > + notmuch_bool_t batch = FALSE; > + FILE *input = stdin; > + char *input_file_name = NULL; > + int opt_index; > int ret = 0; > > /* Setup our handler for SIGINT */ > @@ -148,15 +189,43 @@ notmuch_tag_command (void *ctx, int argc, char *argv[]) > action.sa_flags = SA_RESTART; > sigaction (SIGINT, &action, NULL); > > - tag_ops = tag_op_list_create (ctx); > - if (tag_ops == NULL) { > - fprintf (stderr, "Out of memory.\n"); > + notmuch_opt_desc_t options[] = { > + { NOTMUCH_OPT_BOOLEAN, &batch, "batch", 0, 0 }, > + { NOTMUCH_OPT_STRING, &input_file_name, "input", 'i', 0 }, > + { 0, 0, 0, 0, 0 } > + }; > + > + opt_index = parse_arguments (argc, argv, options, 1); > + if (opt_index < 0) > 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 (parse_tag_command_line (ctx, argc - 1, argv + 1, > - &query_string, tag_ops)) > - return 1; > + if (batch) { > + if (opt_index != argc) { > + fprintf (stderr, "Can't specify both cmdline and stdin!\n"); > + return 1; > + } > + } else { > + > + tag_ops = tag_op_list_create (ctx); > + if (tag_ops == NULL) { > + fprintf (stderr, "Out of memory.\n"); > + return 1; > + } > + > + if (parse_tag_command_line (ctx, argc - opt_index, argv + opt_index, > + &query_string, tag_ops)) > + return 1; > + } > > config = notmuch_config_open (ctx, NULL, NULL); > if (config == NULL) > @@ -169,9 +238,12 @@ notmuch_tag_command (void *ctx, int argc, char *argv[]) > if (notmuch_config_get_maildir_synchronize_flags (config)) > tag_flags |= TAG_FLAG_MAILDIR_SYNC; > > - ret = tag_query (ctx, notmuch, query_string, tag_ops, tag_flags); > + if (batch) > + ret = tag_file (ctx, notmuch, tag_flags, input); > + else > + ret = tag_query (ctx, notmuch, query_string, tag_ops, tag_flags); > > notmuch_database_destroy (notmuch); > > - return ret; > + return ret || interrupted; > } > -- > 1.7.10.4