From e21ba17c8354752f8f6b800bf631369c8897d094 Mon Sep 17 00:00:00 2001 From: david Date: Sat, 22 Dec 2012 09:08:12 +2000 Subject: [PATCH] [Patch v8 03/18] notmuch-tag.c: convert to use tag-utils --- db/52f0de940ff11ca55edb196cbb1ee17cd6a346 | 370 ++++++++++++++++++++++ 1 file changed, 370 insertions(+) create mode 100644 db/52f0de940ff11ca55edb196cbb1ee17cd6a346 diff --git a/db/52f0de940ff11ca55edb196cbb1ee17cd6a346 b/db/52f0de940ff11ca55edb196cbb1ee17cd6a346 new file mode 100644 index 000000000..f969dc6b4 --- /dev/null +++ b/db/52f0de940ff11ca55edb196cbb1ee17cd6a346 @@ -0,0 +1,370 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 43EF6431FBD + for ; Fri, 21 Dec 2012 05:08:44 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] + 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 byr92++2CxUt for ; + Fri, 21 Dec 2012 05:08:41 -0800 (PST) +Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238]) + (using TLSv1 with cipher AES256-SHA (256/256 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 2291A431FAF + for ; Fri, 21 Dec 2012 05:08:39 -0800 (PST) +Received: from fctnnbsc30w-156034082078.dhcp-dynamic.fibreop.nb.bellaliant.net + ([156.34.82.78] helo=zancas.localnet) + by tesseract.cs.unb.ca with esmtpsa + (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72) + (envelope-from ) + id 1Tm2L6-0005dZ-6D; Fri, 21 Dec 2012 09:08:36 -0400 +Received: from bremner by zancas.localnet with local (Exim 4.80) + (envelope-from ) + id 1Tm2L0-0005yN-NR; Fri, 21 Dec 2012 09:08:30 -0400 +From: david@tethera.net +To: notmuch@notmuchmail.org +Subject: [Patch v8 03/18] notmuch-tag.c: convert to use tag-utils +Date: Fri, 21 Dec 2012 09:08:12 -0400 +Message-Id: <1356095307-22895-3-git-send-email-david@tethera.net> +X-Mailer: git-send-email 1.7.10.4 +In-Reply-To: <1356095307-22895-1-git-send-email-david@tethera.net> +References: <1356095307-22895-1-git-send-email-david@tethera.net> +X-Spam_bar: - +Cc: David Bremner +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: Fri, 21 Dec 2012 13:08:44 -0000 + +From: David Bremner + +Command line parsing is factored out into a function +parse_tag_command_line in tag-utils.c. + +There is some duplicated code eliminated in tag_query, and a bunch of +translation from using the bare tag_op structs to using that tag-utils +API. +--- + notmuch-tag.c | 109 +++++++++++++-------------------------------------------- + tag-util.c | 51 +++++++++++++++++++++++++-- + tag-util.h | 15 ++++++++ + 3 files changed, 89 insertions(+), 86 deletions(-) + +diff --git a/notmuch-tag.c b/notmuch-tag.c +index 88d559b..0965ee7 100644 +--- a/notmuch-tag.c ++++ b/notmuch-tag.c +@@ -19,6 +19,7 @@ + */ + + #include "notmuch-client.h" ++#include "tag-util.h" + + static volatile sig_atomic_t interrupted; + +@@ -54,14 +55,9 @@ _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, +- const tag_operation_t *tag_ops) ++ const tag_op_list_t *list) + { + /* This is subtler than it looks. Xapian ignores the '-' operator + * at the beginning both queries and parenthesized groups and, +@@ -73,19 +69,20 @@ _optimize_tag_query (void *ctx, const char *orig_query_string, + + char *escaped, *query_string; + const char *join = ""; +- int i; ++ size_t i; + unsigned int max_tag_len = 0; + + /* Don't optimize if there are no tag changes. */ +- if (tag_ops[0].tag == NULL) ++ if (tag_op_list_size (list) == 0) + return talloc_strdup (ctx, orig_query_string); + + /* 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; tag_ops[i].tag; i++) +- if (strlen (tag_ops[i].tag) > max_tag_len) +- max_tag_len = strlen (tag_ops[i].tag); ++ for (i = 0; i < tag_op_list_size (list); i++) ++ if (strlen (tag_op_list_tag (list, i)) > max_tag_len) ++ max_tag_len = strlen (tag_op_list_tag (list, i)); ++ + escaped = talloc_array (ctx, char, max_tag_len * 2 + 3); + if (! escaped) + return NULL; +@@ -96,11 +93,11 @@ _optimize_tag_query (void *ctx, const char *orig_query_string, + else + query_string = talloc_asprintf (ctx, "( %s ) and (", orig_query_string); + +- for (i = 0; tag_ops[i].tag && query_string; i++) { ++ for (i = 0; i < tag_op_list_size (list) && query_string; i++) { + query_string = talloc_asprintf_append_buffer ( + query_string, "%s%stag:%s", join, +- tag_ops[i].remove ? "" : "not ", +- _escape_tag (escaped, tag_ops[i].tag)); ++ tag_op_list_isremove (list, i) ? "" : "not ", ++ _escape_tag (escaped, tag_op_list_tag (list, i))); + join = " or "; + } + +@@ -111,17 +108,15 @@ _optimize_tag_query (void *ctx, const char *orig_query_string, + return query_string; + } + +-/* Tag messages matching 'query_string' according to 'tag_ops', which +- * must be an array of tagging operations terminated with an empty +- * element. */ ++/* Tag messages matching 'query_string' according to 'tag_ops' ++ */ + static int + tag_query (void *ctx, notmuch_database_t *notmuch, const char *query_string, +- tag_operation_t *tag_ops, notmuch_bool_t synchronize_flags) ++ tag_op_list_t *tag_ops, tag_op_flag_t flags) + { + notmuch_query_t *query; + notmuch_messages_t *messages; + notmuch_message_t *message; +- int i; + + /* Optimize the query so it excludes messages that already have + * the specified set of tags. */ +@@ -144,21 +139,7 @@ tag_query (void *ctx, notmuch_database_t *notmuch, const char *query_string, + notmuch_messages_valid (messages) && ! interrupted; + notmuch_messages_move_to_next (messages)) { + message = notmuch_messages_get (messages); +- +- notmuch_message_freeze (message); +- +- 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); +- +- if (synchronize_flags) +- notmuch_message_tags_to_maildir_flags (message); +- ++ tag_op_list_apply (message, tag_ops, flags | TAG_FLAG_PRE_OPTIMIZED); + notmuch_message_destroy (message); + } + +@@ -170,15 +151,13 @@ tag_query (void *ctx, notmuch_database_t *notmuch, const char *query_string, + int + notmuch_tag_command (void *ctx, int argc, char *argv[]) + { +- tag_operation_t *tag_ops; +- int tag_ops_count = 0; +- char *query_string; ++ tag_op_list_t *tag_ops = NULL; ++ char *query_string = NULL; + notmuch_config_t *config; + notmuch_database_t *notmuch; + struct sigaction action; +- notmuch_bool_t synchronize_flags; +- int i; +- int ret; ++ tag_op_flag_t tag_flags = TAG_FLAG_NONE; ++ int ret = 0; + + /* Setup our handler for SIGINT */ + memset (&action, 0, sizeof (struct sigaction)); +@@ -187,54 +166,15 @@ notmuch_tag_command (void *ctx, int argc, char *argv[]) + action.sa_flags = SA_RESTART; + sigaction (SIGINT, &action, NULL); + +- 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); ++ tag_ops = tag_op_list_create (ctx); + if (tag_ops == NULL) { + fprintf (stderr, "Out of memory.\n"); + return 1; + } + +- for (i = 0; i < argc; i++) { +- if (strcmp (argv[i], "--") == 0) { +- i++; +- break; +- } +- if (argv[i][0] == '+' || argv[i][0] == '-') { +- if (argv[i][0] == '+' && argv[i][1] == '\0') { +- fprintf (stderr, "Error: tag names cannot be empty.\n"); +- return 1; +- } +- if (argv[i][0] == '+' && argv[i][1] == '-') { +- /* This disallows adding the non-removable tag "-" and +- * enables notmuch tag to take long options in the +- * future. */ +- fprintf (stderr, "Error: tag names must not start with '-'.\n"); +- return 1; +- } +- tag_ops[tag_ops_count].tag = argv[i] + 1; +- tag_ops[tag_ops_count].remove = (argv[i][0] == '-'); +- tag_ops_count++; +- } else { +- break; +- } +- } +- +- 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; +- } +- +- query_string = query_string_from_args (ctx, argc - i, &argv[i]); +- +- if (*query_string == '\0') { +- fprintf (stderr, "Error: notmuch tag requires at least one search term.\n"); ++ if (parse_tag_command_line (ctx, argc - 1, argv + 1, ++ &query_string, tag_ops)) + return 1; +- } + + config = notmuch_config_open (ctx, NULL, NULL); + if (config == NULL) +@@ -244,9 +184,10 @@ notmuch_tag_command (void *ctx, int argc, char *argv[]) + NOTMUCH_DATABASE_MODE_READ_WRITE, ¬much)) + return 1; + +- synchronize_flags = notmuch_config_get_maildir_synchronize_flags (config); ++ if (notmuch_config_get_maildir_synchronize_flags (config)) ++ tag_flags |= TAG_FLAG_MAILDIR_SYNC; + +- ret = tag_query (ctx, notmuch, query_string, tag_ops, synchronize_flags); ++ ret = tag_query (ctx, notmuch, query_string, tag_ops, tag_flags); + + notmuch_database_destroy (notmuch); + +diff --git a/tag-util.c b/tag-util.c +index 13d9035..f89669a 100644 +--- a/tag-util.c ++++ b/tag-util.c +@@ -45,8 +45,9 @@ illegal_tag (const char *tag, notmuch_bool_t remove) + if (*tag == '\0' && ! remove) + return "empty tag forbidden"; + +- /* This disallows adding the non-removable tag "-" and +- * enables notmuch tag to take long options more easily. ++ /* This disallows adding tags starting with "-", in particular the ++ * non-removable tag "-" and enables notmuch tag to take long ++ * options more easily. + */ + + if (*tag == '-' && ! remove) +@@ -163,6 +164,52 @@ parse_tag_line (void *ctx, char *line, + return ret; + } + ++tag_parse_status_t ++parse_tag_command_line (void *ctx, int argc, char **argv, ++ char **query_str, tag_op_list_t *tag_ops) ++{ ++ ++ int i; ++ ++ tag_op_list_reset (tag_ops); ++ ++ for (i = 0; i < argc; i++) { ++ if (strcmp (argv[i], "--") == 0) { ++ i++; ++ break; ++ } ++ ++ if (argv[i][0] != '+' && argv[i][0] != '-') ++ break; ++ ++ notmuch_bool_t is_remove = argv[i][0] == '-'; ++ const char *msg; ++ ++ msg = illegal_tag (argv[i] + 1, is_remove); ++ if (msg) { ++ fprintf (stderr, "Error: %s", msg); ++ return TAG_PARSE_INVALID; ++ } ++ ++ tag_op_list_append (ctx, tag_ops, argv[i] + 1, is_remove); ++ } ++ ++ if (tag_op_list_size (tag_ops) == 0) { ++ fprintf (stderr, "Error: 'notmuch tag' requires at least one tag to add or remove.\n"); ++ return TAG_PARSE_INVALID; ++ } ++ ++ *query_str = query_string_from_args (ctx, argc - i, &argv[i]); ++ ++ if (*query_str == NULL || **query_str == '\0') { ++ fprintf (stderr, "Error: notmuch tag requires at least one search term.\n"); ++ return TAG_PARSE_INVALID; ++ } ++ ++ return TAG_PARSE_SUCCESS; ++} ++ ++ + static inline void + message_error (notmuch_message_t *message, + notmuch_status_t status, +diff --git a/tag-util.h b/tag-util.h +index 99b0fa0..2889736 100644 +--- a/tag-util.h ++++ b/tag-util.h +@@ -72,6 +72,21 @@ parse_tag_line (void *ctx, char *line, + tag_op_flag_t flags, + char **query_str, tag_op_list_t *ops); + ++ ++ ++/* Parse a command line of the following format: ++ * ++ * +|- [...] [--] ++ * ++ * Output Parameters: ++ * ops contains a list of tag operations ++ * query_str the search terms. ++ */ ++ ++tag_parse_status_t ++parse_tag_command_line (void *ctx, int argc, char **argv, ++ char **query_str, tag_op_list_t *ops); ++ + /* + * Create an empty list of tag operations + * +-- +1.7.10.4 + -- 2.26.2