debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-12-23 01:44:52 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

cli: add --remove-all option to "notmuch tag"

Browse source 
Add --remove-all option to "notmuch tag" to remove all tags from the
messages matching query before applying the tag changes. This allows
removal of all tags 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
This commit is contained in:
Jani Nikula 2013-03-09 16:56:49 +02:00 committed by David Bremner
parent a6822eccac
commit 268666a071
1 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
notmuch-tag.c
View file

@ -99,13 +99,16 @@ tag_query (void *ctx, notmuch_database_t *notmuch, const char *query_string,
notmuch_message_t *message; notmuch_message_t *message;
int ret = NOTMUCH_STATUS_SUCCESS; int ret = NOTMUCH_STATUS_SUCCESS;
/* Optimize the query so it excludes messages that already have if (! (flags & TAG_FLAG_REMOVE_ALL)) {
* the specified set of tags. */ /* 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); query_string = _optimize_tag_query (ctx, query_string, tag_ops);
if (query_string == NULL) { if (query_string == NULL) {
fprintf (stderr, "Out of memory.\n"); fprintf (stderr, "Out of memory.\n");
return 1; return 1;
} }
flags |= TAG_FLAG_PRE_OPTIMIZED;
}
query = notmuch_query_create (notmuch, query_string); query = notmuch_query_create (notmuch, query_string);
if (query == NULL) { if (query == NULL) {
@ -120,7 +123,7 @@ tag_query (void *ctx, notmuch_database_t *notmuch, const char *query_string,
notmuch_messages_valid (messages) && ! interrupted; notmuch_messages_valid (messages) && ! interrupted;
notmuch_messages_move_to_next (messages)) { notmuch_messages_move_to_next (messages)) {
message = notmuch_messages_get (messages); message = notmuch_messages_get (messages);
ret = tag_op_list_apply (message, tag_ops, flags | TAG_FLAG_PRE_OPTIMIZED); ret = tag_op_list_apply (message, tag_ops, flags);
notmuch_message_destroy (message); notmuch_message_destroy (message);
if (ret != NOTMUCH_STATUS_SUCCESS) if (ret != NOTMUCH_STATUS_SUCCESS)
break; break;
@ -186,6 +189,7 @@ notmuch_tag_command (notmuch_config_t *config, int argc, char *argv[])
struct sigaction action; struct sigaction action;
tag_op_flag_t tag_flags = TAG_FLAG_NONE; tag_op_flag_t tag_flags = TAG_FLAG_NONE;
notmuch_bool_t batch = FALSE; notmuch_bool_t batch = FALSE;
notmuch_bool_t remove_all = FALSE;
FILE *input = stdin; FILE *input = stdin;
char *input_file_name = NULL; char *input_file_name = NULL;
int opt_index; int opt_index;
@ -201,6 +205,7 @@ notmuch_tag_command (notmuch_config_t *config, int argc, char *argv[])
notmuch_opt_desc_t options[] = { notmuch_opt_desc_t options[] = {
{ NOTMUCH_OPT_BOOLEAN, &batch, "batch", 0, 0 }, { NOTMUCH_OPT_BOOLEAN, &batch, "batch", 0, 0 },
{ NOTMUCH_OPT_STRING, &input_file_name, "input", 'i', 0 }, { NOTMUCH_OPT_STRING, &input_file_name, "input", 'i', 0 },
{ NOTMUCH_OPT_BOOLEAN, &remove_all, "remove-all", 0, 0 },
{ 0, 0, 0, 0, 0 } { 0, 0, 0, 0, 0 }
}; };
@ -223,6 +228,10 @@ notmuch_tag_command (notmuch_config_t *config, int argc, char *argv[])
fprintf (stderr, "Can't specify both cmdline and stdin!\n"); fprintf (stderr, "Can't specify both cmdline and stdin!\n");
return 1; return 1;
} }
if (remove_all) {
fprintf (stderr, "Can't specify both --remove-all and --batch\n");
return 1;
}
} else { } else {
tag_ops = tag_op_list_create (config); tag_ops = tag_op_list_create (config);
if (tag_ops == NULL) { if (tag_ops == NULL) {
@ -234,7 +243,7 @@ notmuch_tag_command (notmuch_config_t *config, int argc, char *argv[])
&query_string, tag_ops)) &query_string, tag_ops))
return 1; return 1;
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"); fprintf (stderr, "Error: 'notmuch tag' requires at least one tag to add or remove.\n");
return 1; return 1;
} }
@ -247,6 +256,9 @@ notmuch_tag_command (notmuch_config_t *config, int argc, char *argv[])
if (notmuch_config_get_maildir_synchronize_flags (config)) if (notmuch_config_get_maildir_synchronize_flags (config))
tag_flags |= TAG_FLAG_MAILDIR_SYNC; tag_flags |= TAG_FLAG_MAILDIR_SYNC;
if (remove_all)
tag_flags |= TAG_FLAG_REMOVE_ALL;
if (batch) if (batch)
ret = tag_file (config, notmuch, tag_flags, input); ret = tag_file (config, notmuch, tag_flags, input);
else else