Apply the +tag and -tag operations specified on the command-line. --- notmuch-insert.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/notmuch-insert.c b/notmuch-insert.c index e4631a2..81a528c 100644 --- a/notmuch-insert.c +++ b/notmuch-insert.c @@ -174,7 +174,8 @@ copy_fd_data (int fdin, int fdout) * The file is renamed to encode notmuch tags as maildir flags. */ static notmuch_bool_t add_file_to_database (notmuch_database_t *notmuch, const char *path, - const char **new_tags) + const char **new_tags, + const notmuch_tag_operation_t *tag_ops) { notmuch_message_t *message; notmuch_status_t status; @@ -211,6 +212,14 @@ add_file_to_database (notmuch_database_t *notmuch, const char *path, notmuch_message_add_tag (message, new_tags[i]); } + /* Apply the tags specified on the command-line. */ + for (i = 0; tag_ops[i].tag; i++) { + if (tag_ops[i].remove) + notmuch_message_remove_tag (message, tag_ops[i].tag); + else + notmuch_message_add_tag (message, tag_ops[i].tag); + } + notmuch_message_thaw (message); notmuch_message_tags_to_maildir_flags (message); @@ -222,7 +231,8 @@ add_file_to_database (notmuch_database_t *notmuch, const char *path, static notmuch_bool_t insert_message (void *ctx, notmuch_database_t *notmuch, int fdin, - const char *dir, const char **new_tags) + const char *dir, const char **new_tags, + const notmuch_tag_operation_t *tag_ops) { char *tmppath; char *newpath; @@ -243,7 +253,7 @@ insert_message (void *ctx, notmuch_database_t *notmuch, int fdin, return FALSE; } - ret = add_file_to_database (notmuch, newpath, new_tags); + ret = add_file_to_database (notmuch, newpath, new_tags, tag_ops); if (!ret) { /* XXX maybe there should be an option to keep the file in maildir? */ unlink (newpath); @@ -327,7 +337,8 @@ notmuch_insert_command (void *ctx, int argc, char *argv[]) NOTMUCH_DATABASE_MODE_READ_WRITE, ¬much)) return 1; - ret = insert_message (ctx, notmuch, STDIN_FILENO, maildir, new_tags); + ret = insert_message (ctx, notmuch, STDIN_FILENO, maildir, new_tags, + tag_ops); notmuch_database_destroy (notmuch); -- 1.7.12.1