From cb407aae72f39e01f8f4d39f3e2cecf45742e69b Mon Sep 17 00:00:00 2001 From: Jani Nikula Date: Tue, 4 Dec 2012 00:12:44 +0200 Subject: [PATCH] [RFC PATCH] cli: add --remove-all option to "notmuch tag" --- b9/85eae79b8f217826a12de4cff5beaf6855069a | 181 ++++++++++++++++++++++ 1 file changed, 181 insertions(+) create mode 100644 b9/85eae79b8f217826a12de4cff5beaf6855069a diff --git a/b9/85eae79b8f217826a12de4cff5beaf6855069a b/b9/85eae79b8f217826a12de4cff5beaf6855069a new file mode 100644 index 000000000..be9544ca8 --- /dev/null +++ b/b9/85eae79b8f217826a12de4cff5beaf6855069a @@ -0,0 +1,181 @@ +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 BADEA431FBC + for ; Mon, 3 Dec 2012 14:13:01 -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 Jjnh7u4QS5YC for ; + Mon, 3 Dec 2012 14:12:50 -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 B8064431FAE + for ; Mon, 3 Dec 2012 14:12:49 -0800 (PST) +Received: by mail-lb0-f181.google.com with SMTP id ge1so2940948lbb.26 + for ; Mon, 03 Dec 2012 14:12:48 -0800 (PST) +X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=google.com; s=20120113; + h=from:to:cc:subject:date:message-id:x-mailer:x-gm-message-state; + bh=HLxnVsvyKhd7lBH1iN5n8aexcrQxJjD/fNjgBNvSBsQ=; + b=D0WmJlk+KZVD4FYePw0BrHf9CCGkALbOrp0RxYOL4pey0oIK2nhW/J4GoSpRMz4uln + A7Wgj/3FlhDe15WY2gaJL8O23SoQM8WuD/szf4ezw4Cr+BAG5VQ0qZseccLyYEILBHpq + FLZNBwm/HY3QsUQyTbUnnbeua5pWtBVu38MqTfA38139Sc/Mbnc6/dq7hsFvR9hoQ0QU + 7tkwK61/S+z3APPt4Z8JmhfleXTQHe0FgZGYcvAEmE0A/H0oKdLwqesqY0Ph2oZlMWcG + O12Ogk6FQFBKBsRONXIje/YWfaT3A8ArN6y9TNdvfuS3rBDVI50y1SuKCV1cf5bUiJVo + vm7A== +Received: by 10.152.106.79 with SMTP id gs15mr11029119lab.31.1354572768087; + Mon, 03 Dec 2012 14:12:48 -0800 (PST) +Received: from localhost (dsl-hkibrasgw4-fe51df00-27.dhcp.inet.fi. + [80.223.81.27]) + by mx.google.com with ESMTPS id p5sm5987935lbh.2.2012.12.03.14.12.46 + (version=SSLv3 cipher=OTHER); Mon, 03 Dec 2012 14:12:47 -0800 (PST) +From: Jani Nikula +To: notmuch@notmuchmail.org +Subject: [RFC PATCH] cli: add --remove-all option to "notmuch tag" +Date: Tue, 4 Dec 2012 00:12:44 +0200 +Message-Id: <1354572764-28701-1-git-send-email-jani@nikula.org> +X-Mailer: git-send-email 1.7.10.4 +X-Gm-Message-State: + ALoCoQmTXjOJlgp/oRbie+KNWitO8OyqaexHjNKf5/b/6UK2GOKZyTvfZd1KCNILYbr8XreKUkYj +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: Mon, 03 Dec 2012 22:13:01 -0000 + +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. +--- + 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 + -- 2.26.2