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 7A90F431FCB for ; Sat, 24 Mar 2012 09:14:49 -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 3CJsC2RZQ6Ep for ; Sat, 24 Mar 2012 09:14:47 -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 4697B431FAF for ; Sat, 24 Mar 2012 09:14:47 -0700 (PDT) Received: by lahc1 with SMTP id c1so3315541lah.26 for ; Sat, 24 Mar 2012 09:14:45 -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=LnlT8c0fIqQu8/YJQmbrdc7d0rlhF34c1krs3ax1FX8=; b=Gf3SVFEgT59h2GN4b7D2fNZQGYgMTAz3DNs4Z47Cii14eZQAN7GdVdrowF5ZVEIf6i 4lG/7yGSL4i6QjvmfgL6h+W+KdY98ixhiS8F47AkJPC+1fDfhpL0PXu055H2bUQcnLCu cR5eyyJp/ec/GHuIGWR+RVkzOfbfE5u/3igSF5eLw/uaWSWhKp1gEyb2TeAUobytQaUH xLkaN6fMAeoVH1obfPT4yMMaLAZBy+6AMg2DBfIDDlZUaUcD4lokeEgVwC1tyWvokxDN yw+yuONVgeHi6EhgJOsjW53ChMWcjRhxzgYD2zTJmKfnB/ZqseGq9qXXSI11z93hP/VP LAJQ== Received: by 10.112.101.164 with SMTP id fh4mr5697827lbb.76.1332605685618; Sat, 24 Mar 2012 09:14:45 -0700 (PDT) Received: from localhost (dsl-hkibrasgw4-fe50f800-253.dhcp.inet.fi. [84.248.80.253]) by mx.google.com with ESMTPS id ph8sm11377376lab.15.2012.03.24.09.14.43 (version=SSLv3 cipher=OTHER); Sat, 24 Mar 2012 09:14:44 -0700 (PDT) From: Jani Nikula To: notmuch@notmuchmail.org Subject: [PATCH 1/3] cli: refactor "notmuch tag" data structures for tagging operations Date: Sat, 24 Mar 2012 18:14:35 +0200 Message-Id: <992ada5cb2fa5f89d4f38b10d62f1c178b3174e2.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: ALoCoQmpt7D/U6wwZn/eZP6pp6LrglNnCEajz2s2QvgLuc42Xzi3KIZviThzXTa5MrpGNSYG0LKI 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:49 -0000 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. Signed-off-by: Jani Nikula --- notmuch-tag.c | 80 +++++++++++++++++++++++++------------------------------- 1 files changed, 36 insertions(+), 44 deletions(-) diff --git a/notmuch-tag.c b/notmuch-tag.c index 36b9b09..98b2126 100644 --- a/notmuch-tag.c +++ b/notmuch-tag.c @@ -53,10 +53,14 @@ _escape_tag (char *buf, const char *tag) return buf; } +typedef struct { + const char *tag; + notmuch_bool_t remove; +} tag_operation_t; + 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) +_optimize_tag_query (void *ctx, const char *orig_query_string, + const tag_operation_t *tag_ops) { /* This is subtler than it looks. Xapian ignores the '-' operator * at the beginning both queries and parenthesized groups and, @@ -74,12 +78,9 @@ _optimize_tag_query (void *ctx, const char *orig_query_string, char *argv[], /* 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); + for (i = 0; tag_ops[i].tag; i++) + if (strlen (tag_ops[i].tag) > max_tag_len) + max_tag_len = strlen (tag_ops[i].tag); escaped = talloc_array(ctx, char, max_tag_len * 2 + 3); if (!escaped) return NULL; @@ -90,16 +91,11 @@ _optimize_tag_query (void *ctx, const char *orig_query_string, char *argv[], 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++) { + for (i = 0; tag_ops[i].tag && query_string; i++) { query_string = talloc_asprintf_append_buffer ( - query_string, "%stag:%s", join, - _escape_tag (escaped, argv[remove_tags[i]] + 1)); + query_string, "%s%stag:%s", join, + tag_ops[i].remove ? "" : "not ", + _escape_tag (escaped, tag_ops[i].tag)); join = " or "; } @@ -113,9 +109,8 @@ _optimize_tag_query (void *ctx, const char *orig_query_string, char *argv[], int notmuch_tag_command (void *ctx, int argc, char *argv[]) { - int *add_tags, *remove_tags; - int add_tags_count = 0; - int remove_tags_count = 0; + tag_operation_t *tag_ops; + int tag_ops_count = 0; char *query_string; notmuch_config_t *config; notmuch_database_t *notmuch; @@ -133,35 +128,34 @@ notmuch_tag_command (void *ctx, int argc, char *argv[]) action.sa_flags = SA_RESTART; sigaction (SIGINT, &action, NULL); - add_tags = talloc_size (ctx, argc * sizeof (int)); - if (add_tags == NULL) { - fprintf (stderr, "Out of memory.\n"); - return 1; - } + argc--; argv++; /* skip subcommand argument */ - remove_tags = talloc_size (ctx, argc * sizeof (int)); - if (remove_tags == NULL) { + /* 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; } - argc--; argv++; /* skip subcommand argument */ - for (i = 0; i < argc; i++) { if (strcmp (argv[i], "--") == 0) { i++; break; } - if (argv[i][0] == '+') { - add_tags[add_tags_count++] = i; - } else if (argv[i][0] == '-') { - remove_tags[remove_tags_count++] = i; + if (argv[i][0] == '+' || argv[i][0] == '-') { + tag_ops[tag_ops_count++] = (tag_operation_t) { + .tag = argv[i] + 1, + .remove = argv[i][0] == '-', + }; } else { 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"); return 1; } @@ -175,9 +169,7 @@ notmuch_tag_command (void *ctx, int argc, char *argv[]) /* 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); + query_string = _optimize_tag_query (ctx, query_string, tag_ops); if (query_string == NULL) { fprintf (stderr, "Out of memory.\n"); return 1; @@ -211,12 +203,12 @@ notmuch_tag_command (void *ctx, int argc, char *argv[]) notmuch_message_freeze (message); - for (i = 0; i < remove_tags_count; i++) - notmuch_message_remove_tag (message, - argv[remove_tags[i]] + 1); - - for (i = 0; i < add_tags_count; i++) - notmuch_message_add_tag (message, argv[add_tags[i]] + 1); + 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); -- 1.7.5.4