From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id C42AB431FC9 for ; Sat, 24 Mar 2012 09:14:56 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" 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 lToymEdGhmG4 for ; Sat, 24 Mar 2012 09:14:54 -0700 (PDT) Received: from mail-lpp01m010-f53.google.com (mail-lpp01m010-f53.google.com [209.85.215.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id 0173B431FD4 for ; Sat, 24 Mar 2012 09:14:52 -0700 (PDT) Received: by mail-lpp01m010-f53.google.com with SMTP id c1so3315541lah.26 for ; Sat, 24 Mar 2012 09:14:52 -0700 (PDT) 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:in-reply-to:references :in-reply-to:references:x-gm-message-state; bh=DNhJ2W0qd3YGQ+F5rtC6xcltgt/nj69p1TcXdjNXmYI=; b=b/2vVf+XYo3Vnnbk8FeBaGSc2bMEVkWwQmhApUf1dS/WhVYbsFgd5x4yA8Fmo0EpHo hDcrUXbgXq3JsjeLDQn7tJR3iEZff6qrYioiHc8rHUS+oxiafH1+Fzf4p5KJA4grnGKm hYHzGMufJmgYw9UaLSlBjC7Aw6/1NcvM1OXZOSiZ5uRDyRRr8AnDQj7sSmhjkpyszsd+ /gfMPl3rfabc3emECMuZrweBQGowdPNLuITAWaV9LBDmHkummbnr576J8f8pLP5DqYJj DOfLW6sizElUGRgEDBInjkXZ2EB22ZYn5aYx5r8ZnwSBz/3S92FBPzUfQXmBY7zQNyee NxeQ== Received: by 10.112.105.15 with SMTP id gi15mr6162628lbb.54.1332605692578; Sat, 24 Mar 2012 09:14:52 -0700 (PDT) Received: from localhost (dsl-hkibrasgw4-fe50f800-253.dhcp.inet.fi. [84.248.80.253]) by mx.google.com with ESMTPS id pw4sm11397961lab.8.2012.03.24.09.14.50 (version=SSLv3 cipher=OTHER); Sat, 24 Mar 2012 09:14:51 -0700 (PDT) From: Jani Nikula To: notmuch@notmuchmail.org Subject: [PATCH 3/3] cli: refactor "notmuch restore" message tagging into a separate function Date: Sat, 24 Mar 2012 18:14:37 +0200 Message-Id: <5adca8d3701d9d01b8cb67e589ce8516d4df9832.1332604895.git.jani@nikula.org> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: References: In-Reply-To: References: X-Gm-Message-State: ALoCoQmA5/y1N8IqeD7PpB2Hhujbj5H2WnUeRxgvjKimzh7cWvWeflMXtNeddrOXysQyjcmUsKpf 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: Sat, 24 Mar 2012 16:14:57 -0000 Refactor to make tagging code easier to reuse in the future. No functional changes. Signed-off-by: Jani Nikula --- notmuch-client.h | 5 +++ notmuch-restore.c | 73 ++------------------------------------------------- notmuch-tag.c | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 83 insertions(+), 70 deletions(-) diff --git a/notmuch-client.h b/notmuch-client.h index fa04fa2..7e3deee 100644 --- a/notmuch-client.h +++ b/notmuch-client.h @@ -203,6 +203,11 @@ json_quote_chararray (const void *ctx, const char *str, const size_t len); char * json_quote_str (const void *ctx, const char *str); +int +tag_message (void *ctx, notmuch_database_t *notmuch, const char *message_id, + char *file_tags, notmuch_bool_t remove_all, + notmuch_bool_t synchronize_flags); + /* notmuch-config.c */ typedef struct _notmuch_config notmuch_config_t; diff --git a/notmuch-restore.c b/notmuch-restore.c index 87d9772..bd6b884 100644 --- a/notmuch-restore.c +++ b/notmuch-restore.c @@ -88,11 +88,7 @@ notmuch_restore_command (unused (void *ctx), int argc, char *argv[]) while ((line_len = getline (&line, &line_size, input)) != -1) { regmatch_t match[3]; - char *message_id, *file_tags, *tag, *next; - notmuch_message_t *message = NULL; - notmuch_status_t status; - notmuch_tags_t *db_tags; - char *db_tags_str; + char *message_id, *file_tags; chomp_newline (line); @@ -109,72 +105,9 @@ notmuch_restore_command (unused (void *ctx), int argc, char *argv[]) file_tags = xstrndup (line + match[2].rm_so, match[2].rm_eo - match[2].rm_so); - status = notmuch_database_find_message (notmuch, message_id, &message); - if (status || message == NULL) { - fprintf (stderr, "Warning: Cannot apply tags to %smessage: %s\n", - message ? "" : "missing ", message_id); - if (status) - fprintf (stderr, "%s\n", - notmuch_status_to_string(status)); - goto NEXT_LINE; - } - - /* In order to detect missing messages, this check/optimization is - * intentionally done *after* first finding the message. */ - if (accumulate && (file_tags == NULL || *file_tags == '\0')) - { - goto NEXT_LINE; - } - - db_tags_str = NULL; - for (db_tags = notmuch_message_get_tags (message); - notmuch_tags_valid (db_tags); - notmuch_tags_move_to_next (db_tags)) - { - const char *tag = notmuch_tags_get (db_tags); - - if (db_tags_str) - db_tags_str = talloc_asprintf_append (db_tags_str, " %s", tag); - else - db_tags_str = talloc_strdup (message, tag); - } - - if (((file_tags == NULL || *file_tags == '\0') && - (db_tags_str == NULL || *db_tags_str == '\0')) || - (file_tags && db_tags_str && strcmp (file_tags, db_tags_str) == 0)) - { - goto NEXT_LINE; - } - - notmuch_message_freeze (message); - - if (!accumulate) - notmuch_message_remove_all_tags (message); - - next = file_tags; - while (next) { - tag = strsep (&next, " "); - if (*tag == '\0') - continue; - status = notmuch_message_add_tag (message, tag); - if (status) { - fprintf (stderr, - "Error applying tag %s to message %s:\n", - tag, message_id); - fprintf (stderr, "%s\n", - notmuch_status_to_string (status)); - } - } - - notmuch_message_thaw (message); - - if (synchronize_flags) - notmuch_message_tags_to_maildir_flags (message); + tag_message (ctx, notmuch, message_id, file_tags, !accumulate, + synchronize_flags); - NEXT_LINE: - if (message) - notmuch_message_destroy (message); - message = NULL; free (message_id); free (file_tags); } diff --git a/notmuch-tag.c b/notmuch-tag.c index c4e3f9d..3aeb878 100644 --- a/notmuch-tag.c +++ b/notmuch-tag.c @@ -161,6 +161,81 @@ tag_query (void *ctx, notmuch_database_t *notmuch, const char *query_string, } int +tag_message (void *ctx, notmuch_database_t *notmuch, const char *message_id, + char *file_tags, notmuch_bool_t remove_all, + notmuch_bool_t synchronize_flags) +{ + notmuch_status_t status; + notmuch_tags_t *db_tags; + char *db_tags_str; + notmuch_message_t *message = NULL; + const char *tag; + char *next; + int ret = 0; + + status = notmuch_database_find_message (notmuch, message_id, &message); + if (status || message == NULL) { + fprintf (stderr, "Warning: Cannot apply tags to %smessage: %s\n", + message ? "" : "missing ", message_id); + if (status) + fprintf (stderr, "%s\n", notmuch_status_to_string(status)); + return 1; + } + + /* In order to detect missing messages, this check/optimization is + * intentionally done *after* first finding the message. */ + if (!remove_all && (file_tags == NULL || *file_tags == '\0')) + goto DONE; + + db_tags_str = NULL; + for (db_tags = notmuch_message_get_tags (message); + notmuch_tags_valid (db_tags); + notmuch_tags_move_to_next (db_tags)) { + tag = notmuch_tags_get (db_tags); + + if (db_tags_str) + db_tags_str = talloc_asprintf_append (db_tags_str, " %s", tag); + else + db_tags_str = talloc_strdup (message, tag); + } + + if (((file_tags == NULL || *file_tags == '\0') && + (db_tags_str == NULL || *db_tags_str == '\0')) || + (file_tags && db_tags_str && strcmp (file_tags, db_tags_str) == 0)) + goto DONE; + + notmuch_message_freeze (message); + + if (remove_all) + notmuch_message_remove_all_tags (message); + + next = file_tags; + while (next) { + tag = strsep (&next, " "); + if (*tag == '\0') + continue; + status = notmuch_message_add_tag (message, tag); + if (status) { + fprintf (stderr, "Error applying tag %s to message %s:\n", + tag, message_id); + fprintf (stderr, "%s\n", notmuch_status_to_string (status)); + ret = 1; + } + } + + notmuch_message_thaw (message); + + if (synchronize_flags) + notmuch_message_tags_to_maildir_flags (message); + +DONE: + if (message) + notmuch_message_destroy (message); + + return ret; +} + +int notmuch_tag_command (void *ctx, int argc, char *argv[]) { tag_operation_t *tag_ops; -- 1.7.5.4