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

cli: refactor "notmuch tag" data structures for tagging operations

Browse source 
To simplify code, keep all tagging operations in a single array
instead of separate add and remove arrays. Apply tag changes in the
order specified on the command line, instead of first removing and
then adding the tags.

This results in a minor functional change: If a tag is both added and
removed, the last specified operation is now used. Previously the tag
was always added. Change the relevant test to reflect the new
behaviour.

Signed-off-by: Jani Nikula <jani@nikula.org>
This commit is contained in:
Jani Nikula 2012-03-27 00:04:09 +03:00 committed by David Bremner
parent 918b803597
commit 8e3ff8fb03
2 changed files with 43 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

89
notmuch-tag.c
View file

@ -53,10 +53,14 @@ _escape_tag (char *buf, const char *tag)
return buf; return buf;
} }
typedef struct {
const char *tag;
notmuch_bool_t remove;
} tag_operation_t;
static char * static char *
_optimize_tag_query (void *ctx, const char *orig_query_string, char *argv[], _optimize_tag_query (void *ctx, const char *orig_query_string,
int *add_tags, int add_tags_count, const tag_operation_t *tag_ops)
int *remove_tags, int remove_tags_count)
{ {
/* This is subtler than it looks. Xapian ignores the '-' operator /* This is subtler than it looks. Xapian ignores the '-' operator
* at the beginning both queries and parenthesized groups and, * at the beginning both queries and parenthesized groups and,
@ -71,15 +75,16 @@ _optimize_tag_query (void *ctx, const char *orig_query_string, char *argv[],
int i; int i;
unsigned int max_tag_len = 0; unsigned int max_tag_len = 0;
/* Don't optimize if there are no tag changes. */
if (tag_ops[0].tag == NULL)
return talloc_strdup (ctx, orig_query_string);
/* Allocate a buffer for escaping tags. This is large enough to /* Allocate a buffer for escaping tags. This is large enough to
* hold a fully escaped tag with every character doubled plus * hold a fully escaped tag with every character doubled plus
* enclosing quotes and a NUL. */ * enclosing quotes and a NUL. */
for (i = 0; i < add_tags_count; i++) for (i = 0; tag_ops[i].tag; i++)
if (strlen (argv[add_tags[i]] + 1) > max_tag_len) if (strlen (tag_ops[i].tag) > max_tag_len)
max_tag_len = strlen (argv[add_tags[i]] + 1); max_tag_len = strlen (tag_ops[i].tag);
for (i = 0; i < remove_tags_count; i++)
if (strlen (argv[remove_tags[i]] + 1) > max_tag_len)
max_tag_len = strlen (argv[remove_tags[i]] + 1);
escaped = talloc_array(ctx, char, max_tag_len * 2 + 3); escaped = talloc_array(ctx, char, max_tag_len * 2 + 3);
if (!escaped) if (!escaped)
return NULL; return NULL;
@ -90,16 +95,11 @@ _optimize_tag_query (void *ctx, const char *orig_query_string, char *argv[],
else else
query_string = talloc_asprintf (ctx, "( %s ) and (", orig_query_string); query_string = talloc_asprintf (ctx, "( %s ) and (", orig_query_string);
for (i = 0; i < add_tags_count && query_string; i++) { for (i = 0; tag_ops[i].tag && query_string; i++) {
query_string = talloc_asprintf_append_buffer ( query_string = talloc_asprintf_append_buffer (
query_string, "%snot tag:%s", join, query_string, "%s%stag:%s", join,
_escape_tag (escaped, argv[add_tags[i]] + 1)); tag_ops[i].remove ? "" : "not ",
join = " or "; _escape_tag (escaped, tag_ops[i].tag));
}
for (i = 0; i < remove_tags_count && query_string; i++) {
query_string = talloc_asprintf_append_buffer (
query_string, "%stag:%s", join,
_escape_tag (escaped, argv[remove_tags[i]] + 1));
join = " or "; join = " or ";
} }
@ -113,9 +113,8 @@ _optimize_tag_query (void *ctx, const char *orig_query_string, char *argv[],
int int
notmuch_tag_command (void *ctx, int argc, char *argv[]) notmuch_tag_command (void *ctx, int argc, char *argv[])
{ {
int *add_tags, *remove_tags; tag_operation_t *tag_ops;
int add_tags_count = 0; int tag_ops_count = 0;
int remove_tags_count = 0;
char *query_string; char *query_string;
notmuch_config_t *config; notmuch_config_t *config;
notmuch_database_t *notmuch; notmuch_database_t *notmuch;
@ -133,35 +132,33 @@ notmuch_tag_command (void *ctx, int argc, char *argv[])
action.sa_flags = SA_RESTART; action.sa_flags = SA_RESTART;
sigaction (SIGINT, &action, NULL); sigaction (SIGINT, &action, NULL);
add_tags = talloc_size (ctx, argc * sizeof (int));
if (add_tags == NULL) {
fprintf (stderr, "Out of memory.\n");
return 1;
}
remove_tags = talloc_size (ctx, argc * sizeof (int));
if (remove_tags == NULL) {
fprintf (stderr, "Out of memory.\n");
return 1;
}
argc--; argv++; /* skip subcommand argument */ argc--; argv++; /* skip subcommand argument */
/* Array of tagging operations (add or remove), terminated with an
* empty element. */
tag_ops = talloc_array (ctx, tag_operation_t, argc + 1);
if (tag_ops == NULL) {
fprintf (stderr, "Out of memory.\n");
return 1;
}
for (i = 0; i < argc; i++) { for (i = 0; i < argc; i++) {
if (strcmp (argv[i], "--") == 0) { if (strcmp (argv[i], "--") == 0) {
i++; i++;
break; break;
} }
if (argv[i][0] == '+') { if (argv[i][0] == '+' || argv[i][0] == '-') {
add_tags[add_tags_count++] = i; tag_ops[tag_ops_count].tag = argv[i] + 1;
} else if (argv[i][0] == '-') { tag_ops[tag_ops_count].remove = (argv[i][0] == '-');
remove_tags[remove_tags_count++] = i; tag_ops_count++;
} else { } else {
break; break;
} }
} }
if (add_tags_count == 0 && remove_tags_count == 0) { tag_ops[tag_ops_count].tag = NULL;
if (tag_ops_count == 0) {
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;
} }
@ -175,9 +172,7 @@ notmuch_tag_command (void *ctx, int argc, char *argv[])
/* Optimize the query so it excludes messages that already have /* Optimize the query so it excludes messages that already have
* the specified set of tags. */ * the specified set of tags. */
query_string = _optimize_tag_query (ctx, query_string, argv, query_string = _optimize_tag_query (ctx, query_string, tag_ops);
add_tags, add_tags_count,
remove_tags, remove_tags_count);
if (query_string == NULL) { if (query_string == NULL) {
fprintf (stderr, "Out of memory.\n"); fprintf (stderr, "Out of memory.\n");
return 1; return 1;
@ -211,12 +206,12 @@ notmuch_tag_command (void *ctx, int argc, char *argv[])
notmuch_message_freeze (message); notmuch_message_freeze (message);
for (i = 0; i < remove_tags_count; i++) for (i = 0; tag_ops[i].tag; i++) {
notmuch_message_remove_tag (message, if (tag_ops[i].remove)
argv[remove_tags[i]] + 1); notmuch_message_remove_tag (message, tag_ops[i].tag);
else
for (i = 0; i < add_tags_count; i++) notmuch_message_add_tag (message, tag_ops[i].tag);
notmuch_message_add_tag (message, argv[add_tags[i]] + 1); }
notmuch_message_thaw (message); notmuch_message_thaw (message);

2
test/tagging
View file

@ -43,7 +43,7 @@ notmuch tag +tag4 -tag4 One
notmuch tag -tag4 +tag4 Two notmuch tag -tag4 +tag4 Two
output=$(notmuch search \* | notmuch_search_sanitize) output=$(notmuch search \* | notmuch_search_sanitize)
test_expect_equal "$output" "\ test_expect_equal "$output" "\
thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; One (:\" inbox tag1 tag4 unread) thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; One (:\" inbox tag1 unread)
thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; Two (inbox tag1 tag4 unread)" thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; Two (inbox tag1 tag4 unread)"
test_done test_done