tag: Automatically limit to messages whose tags will actually change.

[notmuch] / notmuch-tag.c

diff --git a/notmuch-tag.c b/notmuch-tag.c
index 53f08f43dc1019a9f8ada6e905dc1d36f5c43d5c..537d5a4d1625d0747b1fe74f2045a150ee4b67d9 100644 (file)
--- a/notmuch-tag.c
+++ b/notmuch-tag.c
@@ -25,13 +25,86 @@ static volatile sig_atomic_t interrupted;
 static void
 handle_sigint (unused (int sig))
 {
-    ssize_t ignored;
-
     static char msg[] = "Stopping...         \n";
-    ignored = write(2, msg, sizeof(msg)-1);
+    write(2, msg, sizeof(msg)-1);
     interrupted = 1;
 }
 
+static char *
+_escape_tag (char *buf, const char *tag)
+{
+    const char *in = tag;
+    char *out = buf;
+    /* Boolean terms surrounded by double quotes can contain any
+     * character.  Double quotes are quoted by doubling them. */
+    *out++ = '"';
+    while (*in) {
+       if (*in == '"')
+           *out++ = '"';
+       *out++ = *in++;
+    }
+    *out++ = '"';
+    *out = 0;
+    return buf;
+}
+
+static char *
+_optimize_tag_query (void *ctx, const char *orig_query_string, char *argv[],
+                    int *add_tags, int add_tags_count,
+                    int *remove_tags, int remove_tags_count)
+{
+    /* This is subtler than it looks.  Xapian ignores the '-' operator
+     * at the beginning both queries and parenthesized groups and,
+     * furthermore, the presence of a '-' operator at the beginning of
+     * a group can inhibit parsing of the previous operator.  Hence,
+     * the user-provided query MUST appear first, but it is safe to
+     * parenthesize and the exclusion part of the query must not use
+     * the '-' operator (though the NOT operator is fine). */
+
+    char *escaped, *query_string;
+    const char *join = "";
+    int i;
+    unsigned int max_tag_len = 0;
+
+    /* Allocate a buffer for escaping tags.  This is large enough to
+     * hold a fully escaped tag with every character doubled plus
+     * enclosing quotes and a NUL. */
+    for (i = 0; i < add_tags_count; i++)
+       if (strlen (argv[add_tags[i]] + 1) > max_tag_len)
+           max_tag_len = strlen (argv[add_tags[i]] + 1);
+    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);
+    if (!escaped)
+       return NULL;
+
+    /* Build the new query string */
+    if (strcmp (orig_query_string, "*") == 0)
+       query_string = talloc_strdup (ctx, "(");
+    else
+       query_string = talloc_asprintf (ctx, "( %s ) and (", orig_query_string);
+
+    for (i = 0; i < add_tags_count && query_string; i++) {
+       query_string = talloc_asprintf_append_buffer (
+           query_string, "%snot tag:%s", join,
+           _escape_tag (escaped, argv[add_tags[i]] + 1));
+       join = " or ";
+    }
+    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 ";
+    }
+
+    if (query_string)
+       query_string = talloc_strdup_append_buffer (query_string, ")");
+
+    talloc_free (escaped);
+    return query_string;
+}
+
 int
 notmuch_tag_command (void *ctx, unused (int argc), unused (char *argv[]))
 {
@@ -45,6 +118,7 @@ notmuch_tag_command (void *ctx, unused (int argc), unused (char *argv[]))
     notmuch_messages_t *messages;
     notmuch_message_t *message;
     struct sigaction action;
+    notmuch_bool_t synchronize_flags;
     int i;
 
     /* Setup our handler for SIGINT */
@@ -66,6 +140,8 @@ notmuch_tag_command (void *ctx, unused (int argc), unused (char *argv[]))
        return 1;
     }
 
+    argc--; argv++; /* skip subcommand argument */
+
     for (i = 0; i < argc; i++) {
        if (strcmp (argv[i], "--") == 0) {
            i++;
@@ -92,6 +168,16 @@ notmuch_tag_command (void *ctx, unused (int argc), unused (char *argv[]))
        return 1;
     }
 
+    /* Optimize the query so it excludes messages that already have
+     * the specified set of tags. */
+    query_string = _optimize_tag_query (ctx, query_string, argv,
+                                       add_tags, add_tags_count,
+                                       remove_tags, remove_tags_count);
+    if (query_string == NULL) {
+       fprintf (stderr, "Out of memory.\n");
+       return 1;
+    }
+
     config = notmuch_config_open (ctx, NULL, NULL);
     if (config == NULL)
        return 1;
@@ -100,8 +186,8 @@ notmuch_tag_command (void *ctx, unused (int argc), unused (char *argv[]))
                                     NOTMUCH_DATABASE_MODE_READ_WRITE);
     if (notmuch == NULL)
        return 1;
-    notmuch_database_set_maildir_sync (notmuch,
-                                      notmuch_config_get_maildir_synchronize_flags (config));
+
+    synchronize_flags = notmuch_config_get_maildir_synchronize_flags (config);
 
     query = notmuch_query_create (notmuch, query_string);
     if (query == NULL) {
@@ -129,6 +215,9 @@ notmuch_tag_command (void *ctx, unused (int argc), unused (char *argv[]))
 
        notmuch_message_thaw (message);
 
+       if (synchronize_flags)
+           notmuch_message_tags_to_maildir_flags (message);
+
        notmuch_message_destroy (message);
     }