From: Mark Walters Date: Sun, 16 Dec 2012 20:40:56 +0000 (+0000) Subject: Re: [RFC PATCH] cli: add --remove-all option to "notmuch tag" X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=570ec1fefdf0b5db35a37508d5a6f1566c2f35a4;p=notmuch-archives.git Re: [RFC PATCH] cli: add --remove-all option to "notmuch tag" --- diff --git a/5a/bc24fb338d2ac5c2863353e00d51068c4ec2be b/5a/bc24fb338d2ac5c2863353e00d51068c4ec2be new file mode 100644 index 000000000..d3047b20c --- /dev/null +++ b/5a/bc24fb338d2ac5c2863353e00d51068c4ec2be @@ -0,0 +1,213 @@ +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 3A495431FC4 + for ; Sun, 16 Dec 2012 12:41:03 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -1.098 +X-Spam-Level: +X-Spam-Status: No, score=-1.098 tagged_above=-999 required=5 + tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001, + NML_ADSP_CUSTOM_MED=1.2, RCVD_IN_DNSWL_MED=-2.3] 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 j0+jkCkpVI2V for ; + Sun, 16 Dec 2012 12:40:59 -0800 (PST) +Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6]) + (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 62FB0431FAE + for ; Sun, 16 Dec 2012 12:40:59 -0800 (PST) +Received: from smtp.qmul.ac.uk ([138.37.6.40]) + by mail2.qmul.ac.uk with esmtp (Exim 4.71) + (envelope-from ) + id 1TkL13-0005nd-3g; Sun, 16 Dec 2012 20:40:55 +0000 +Received: from 93-97-24-31.zone5.bethere.co.uk ([93.97.24.31] helo=localhost) + by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.69) + (envelope-from ) + id 1TkL12-0000ip-Ma; Sun, 16 Dec 2012 20:40:52 +0000 +From: Mark Walters +To: Jani Nikula , notmuch@notmuchmail.org +Subject: Re: [RFC PATCH] cli: add --remove-all option to "notmuch tag" +In-Reply-To: <1354572764-28701-1-git-send-email-jani@nikula.org> +References: <1354572764-28701-1-git-send-email-jani@nikula.org> +User-Agent: Notmuch/0.14+226~ge56ae2a (http://notmuchmail.org) Emacs/23.4.1 + (x86_64-pc-linux-gnu) +Date: Sun, 16 Dec 2012 20:40:56 +0000 +Message-ID: <87fw35enmv.fsf@qmul.ac.uk> +MIME-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +X-Sender-Host-Address: 93.97.24.31 +X-QM-SPAM-Info: Sender has good ham record. :) +X-QM-Body-MD5: d14b80d6c548e91ea60119cb13eefc1e (of first 20000 bytes) +X-SpamAssassin-Score: -1.8 +X-SpamAssassin-SpamBar: - +X-SpamAssassin-Report: The QM spam filters have analysed this message to + determine if it is + spam. We require at least 5.0 points to mark a message as spam. + This message scored -1.8 points. + Summary of the scoring: + * -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, + * medium trust + * [138.37.6.40 listed in list.dnswl.org] + * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail + provider * (markwalters1009[at]gmail.com) + * 0.5 AWL AWL: From: address is in the auto white-list +X-QM-Scan-Virus: ClamAV says the message is clean +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, 16 Dec 2012 20:41:03 -0000 + + +On Mon, 03 Dec 2012, Jani Nikula wrote: +> Add --remove-all option to "notmuch tag" to remove all tags matching +> query before applying the tag changes. This allows removal and +> unconditional setting of the tags of a message: +> +> $ notmuch tag --remove-all id:foo@example.com +> $ notmuch tag --remove-all +foo +bar id:foo@example.com +> +> without having to resort to the complicated (and still quoting broken): +> +> $ notmuch tag $(notmuch search --output=tags '*' | sed 's/^/-/') id:foo@example.com +> $ notmuch tag $(notmuch search --output=tags '*' | sed 's/^/-/') +foo +bar id:foo@example.com +> +> --- +> +> It's completely untested... +> +> This is on top of David's batch tagging branch new-tagging at +> git://pivot.cs.unb.ca/notmuch.git +> +> If there's interest, I'll spin a new version with tests and man page +> changes after David's stuff has been merged. + +I like this: the possibility of setting the tags to something seems +nice. + +I am not very keen on the option name but don't have anything much +better: maybe --remove-all-first or --set-to? + +Incidentally, does this (or should this) give an error if the user calls +--remove-all with -some_tag (as opposed to +some_tag)? + +Best wishes + +Mark + + +> --- +> notmuch-tag.c | 32 ++++++++++++++++++++------------ +> 1 file changed, 20 insertions(+), 12 deletions(-) +> +> diff --git a/notmuch-tag.c b/notmuch-tag.c +> index e4fca67..67624cc 100644 +> --- a/notmuch-tag.c +> +++ b/notmuch-tag.c +> @@ -119,12 +119,15 @@ tag_query (void *ctx, notmuch_database_t *notmuch, const char *query_string, +> notmuch_messages_t *messages; +> notmuch_message_t *message; +> +> - /* Optimize the query so it excludes messages that already have +> - * the specified set of tags. */ +> - query_string = _optimize_tag_query (ctx, query_string, tag_ops); +> - if (query_string == NULL) { +> - fprintf (stderr, "Out of memory.\n"); +> - return 1; +> + if (! (flags & TAG_FLAG_REMOVE_ALL)) { +> + /* Optimize the query so it excludes messages that already +> + * have the specified set of tags. */ +> + query_string = _optimize_tag_query (ctx, query_string, tag_ops); +> + if (query_string == NULL) { +> + fprintf (stderr, "Out of memory.\n"); +> + return 1; +> + } +> + flags |= TAG_FLAG_PRE_OPTIMIZED; +> } +> +> query = notmuch_query_create (notmuch, query_string); +> @@ -140,7 +143,7 @@ tag_query (void *ctx, notmuch_database_t *notmuch, const char *query_string, +> notmuch_messages_valid (messages) && ! interrupted; +> notmuch_messages_move_to_next (messages)) { +> message = notmuch_messages_get (messages); +> - tag_op_list_apply (message, tag_ops, flags | TAG_FLAG_PRE_OPTIMIZED); +> + tag_op_list_apply (message, tag_ops, flags); +> notmuch_message_destroy (message); +> } +> +> @@ -157,8 +160,9 @@ notmuch_tag_command (void *ctx, int argc, char *argv[]) +> notmuch_config_t *config; +> notmuch_database_t *notmuch; +> struct sigaction action; +> - tag_op_flag_t synchronize_flags = TAG_FLAG_NONE; +> + tag_op_flag_t flags = TAG_FLAG_NONE; +> notmuch_bool_t batch = FALSE; +> + notmuch_bool_t remove_all = FALSE; +> FILE *input = stdin; +> char *input_file_name = NULL; +> int i, opt_index; +> @@ -174,6 +178,7 @@ notmuch_tag_command (void *ctx, int argc, char *argv[]) +> notmuch_opt_desc_t options[] = { +> { NOTMUCH_OPT_BOOLEAN, &batch, "batch", 0, 0 }, +> { NOTMUCH_OPT_STRING, &input_file_name, "input", 'i', 0 }, +> + { NOTMUCH_OPT_BOOLEAN, &remove_all, "remove-all", 0, 0 }, +> { 0, 0, 0, 0, 0 } +> }; +> +> @@ -230,7 +235,7 @@ notmuch_tag_command (void *ctx, int argc, char *argv[]) +> } +> } +> +> - if (tag_op_list_size (tag_ops) == 0) { +> + if (tag_op_list_size (tag_ops) == 0 && !remove_all) { +> fprintf (stderr, "Error: 'notmuch tag' requires at least one tag to add or remove.\n"); +> return 1; +> } +> @@ -252,7 +257,10 @@ notmuch_tag_command (void *ctx, int argc, char *argv[]) +> return 1; +> +> if (notmuch_config_get_maildir_synchronize_flags (config)) +> - synchronize_flags = TAG_FLAG_MAILDIR_SYNC; +> + flags |= TAG_FLAG_MAILDIR_SYNC; +> + +> + if (remove_all) +> + flags |= TAG_FLAG_REMOVE_ALL; +> +> if (batch) { +> +> @@ -280,14 +288,14 @@ notmuch_tag_command (void *ctx, int argc, char *argv[]) +> continue; +> +> if (ret < 0 || tag_query (ctx, notmuch, query_string, +> - tag_ops, synchronize_flags)) +> + tag_ops, flags)) +> break; +> } +> +> if (line) +> free (line); +> } else +> - ret = tag_query (ctx, notmuch, query_string, tag_ops, synchronize_flags); +> + ret = tag_query (ctx, notmuch, query_string, tag_ops, flags); +> +> notmuch_database_destroy (notmuch); +> +> -- +> 1.7.10.4 +> +> _______________________________________________ +> notmuch mailing list +> notmuch@notmuchmail.org +> http://notmuchmail.org/mailman/listinfo/notmuch