From fda31542a2496a8c0b21d6d014987820ce82239f Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Wed, 5 Nov 2014 01:25:51 +0100 Subject: [PATCH] [PATCH v3 02/10] cli: search: Move more variables into search_context_t --- 82/794e72094d2f5871b7f2c83476c148e02a2b51 | 230 ++++++++++++++++++++++ 1 file changed, 230 insertions(+) create mode 100644 82/794e72094d2f5871b7f2c83476c148e02a2b51 diff --git a/82/794e72094d2f5871b7f2c83476c148e02a2b51 b/82/794e72094d2f5871b7f2c83476c148e02a2b51 new file mode 100644 index 000000000..4b642c958 --- /dev/null +++ b/82/794e72094d2f5871b7f2c83476c148e02a2b51 @@ -0,0 +1,230 @@ +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 0F520431FDA + for ; Tue, 4 Nov 2014 16:26:30 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -2.3 +X-Spam-Level: +X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_MED=-2.3] 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 Zq9YJayObk05 for ; + Tue, 4 Nov 2014 16:26:24 -0800 (PST) +Received: from max.feld.cvut.cz (max.feld.cvut.cz [147.32.192.36]) + by olra.theworths.org (Postfix) with ESMTP id C73AC431FB6 + for ; Tue, 4 Nov 2014 16:26:18 -0800 (PST) +Received: from localhost (unknown [192.168.200.7]) + by max.feld.cvut.cz (Postfix) with ESMTP id 258A05CD1A9 + for ; Wed, 5 Nov 2014 01:26:18 +0100 (CET) +X-Virus-Scanned: IMAP STYX AMAVIS +Received: from max.feld.cvut.cz ([192.168.200.1]) + by localhost (styx.feld.cvut.cz [192.168.200.7]) (amavisd-new, + port 10044) with ESMTP id dsZSOgeJy6ee for ; + Wed, 5 Nov 2014 01:26:13 +0100 (CET) +Received: from imap.feld.cvut.cz (imap.feld.cvut.cz [147.32.192.34]) + by max.feld.cvut.cz (Postfix) with ESMTP id 4B3115CD1A8 + for ; Wed, 5 Nov 2014 01:26:13 +0100 (CET) +Received: from wsh by steelpick.2x.cz with local (Exim 4.84) + (envelope-from ) + id 1XloQI-0005Ck-P3; Wed, 05 Nov 2014 01:26:06 +0100 +From: Michal Sojka +To: notmuch@notmuchmail.org +Subject: [PATCH v3 02/10] cli: search: Move more variables into + search_context_t +Date: Wed, 5 Nov 2014 01:25:51 +0100 +Message-Id: <1415147159-19946-3-git-send-email-sojkam1@fel.cvut.cz> +X-Mailer: git-send-email 2.1.1 +In-Reply-To: <1415147159-19946-1-git-send-email-sojkam1@fel.cvut.cz> +References: <1415147159-19946-1-git-send-email-sojkam1@fel.cvut.cz> +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: Wed, 05 Nov 2014 00:26:30 -0000 + +In order to share some command line options between search and address +subcommands we need to add corresponding variables to the context +structure. While we are at it, we also add notmuch_database_t to unify +parameters of all do_search_* functions and to simplify subsequent +commits. + +Otherwise, there are no functional changes. +--- + notmuch-search.c | 49 ++++++++++++++++++++++++++----------------------- + 1 file changed, 26 insertions(+), 23 deletions(-) + +diff --git a/notmuch-search.c b/notmuch-search.c +index 2c47b80..3d2012b 100644 +--- a/notmuch-search.c ++++ b/notmuch-search.c +@@ -34,8 +34,18 @@ typedef enum { + + #define OUTPUT_ADDRESS_FLAGS (OUTPUT_SENDER | OUTPUT_RECIPIENTS) + ++typedef enum { ++ NOTMUCH_FORMAT_JSON, ++ NOTMUCH_FORMAT_TEXT, ++ NOTMUCH_FORMAT_TEXT0, ++ NOTMUCH_FORMAT_SEXP ++} format_sel_t; ++ + typedef struct { ++ notmuch_database_t *notmuch; ++ format_sel_t format_sel; + sprinter_t *format; ++ notmuch_exclude_t exclude; + notmuch_query_t *query; + notmuch_sort_t sort; + output_t output; +@@ -413,14 +423,14 @@ do_search_messages (search_context_t *ctx) + } + + static int +-do_search_tags (notmuch_database_t *notmuch, +- const search_context_t *ctx) ++do_search_tags (const search_context_t *ctx) + { + notmuch_messages_t *messages = NULL; + notmuch_tags_t *tags; + const char *tag; + sprinter_t *format = ctx->format; + notmuch_query_t *query = ctx->query; ++ notmuch_database_t *notmuch = ctx->notmuch; + + /* should the following only special case if no excluded terms + * specified? */ +@@ -464,8 +474,9 @@ do_search_tags (notmuch_database_t *notmuch, + int + notmuch_search_command (notmuch_config_t *config, int argc, char *argv[]) + { +- notmuch_database_t *notmuch; + search_context_t ctx = { ++ .format_sel = NOTMUCH_FORMAT_TEXT, ++ .exclude = NOTMUCH_EXCLUDE_TRUE, + .sort = NOTMUCH_SORT_NEWEST_FIRST, + .output = 0, + .offset = 0, +@@ -474,22 +485,14 @@ notmuch_search_command (notmuch_config_t *config, int argc, char *argv[]) + }; + char *query_str; + int opt_index, ret; +- notmuch_exclude_t exclude = NOTMUCH_EXCLUDE_TRUE; + unsigned int i; + +- enum { +- NOTMUCH_FORMAT_JSON, +- NOTMUCH_FORMAT_TEXT, +- NOTMUCH_FORMAT_TEXT0, +- NOTMUCH_FORMAT_SEXP +- } format_sel = NOTMUCH_FORMAT_TEXT; +- + notmuch_opt_desc_t options[] = { + { NOTMUCH_OPT_KEYWORD, &ctx.sort, "sort", 's', + (notmuch_keyword_t []){ { "oldest-first", NOTMUCH_SORT_OLDEST_FIRST }, + { "newest-first", NOTMUCH_SORT_NEWEST_FIRST }, + { 0, 0 } } }, +- { NOTMUCH_OPT_KEYWORD, &format_sel, "format", 'f', ++ { NOTMUCH_OPT_KEYWORD, &ctx.format_sel, "format", 'f', + (notmuch_keyword_t []){ { "json", NOTMUCH_FORMAT_JSON }, + { "sexp", NOTMUCH_FORMAT_SEXP }, + { "text", NOTMUCH_FORMAT_TEXT }, +@@ -505,7 +508,7 @@ notmuch_search_command (notmuch_config_t *config, int argc, char *argv[]) + { "files", OUTPUT_FILES }, + { "tags", OUTPUT_TAGS }, + { 0, 0 } } }, +- { NOTMUCH_OPT_KEYWORD, &exclude, "exclude", 'x', ++ { NOTMUCH_OPT_KEYWORD, &ctx.exclude, "exclude", 'x', + (notmuch_keyword_t []){ { "true", NOTMUCH_EXCLUDE_TRUE }, + { "false", NOTMUCH_EXCLUDE_FALSE }, + { "flag", NOTMUCH_EXCLUDE_FLAG }, +@@ -530,7 +533,7 @@ notmuch_search_command (notmuch_config_t *config, int argc, char *argv[]) + return EXIT_FAILURE; + } + +- switch (format_sel) { ++ switch (ctx.format_sel) { + case NOTMUCH_FORMAT_TEXT: + ctx.format = sprinter_text_create (config, stdout); + break; +@@ -555,10 +558,10 @@ notmuch_search_command (notmuch_config_t *config, int argc, char *argv[]) + notmuch_exit_if_unsupported_format (); + + if (notmuch_database_open (notmuch_config_get_database_path (config), +- NOTMUCH_DATABASE_MODE_READ_ONLY, ¬much)) ++ NOTMUCH_DATABASE_MODE_READ_ONLY, &ctx.notmuch)) + return EXIT_FAILURE; + +- query_str = query_string_from_args (notmuch, argc-opt_index, argv+opt_index); ++ query_str = query_string_from_args (ctx.notmuch, argc-opt_index, argv+opt_index); + if (query_str == NULL) { + fprintf (stderr, "Out of memory.\n"); + return EXIT_FAILURE; +@@ -568,7 +571,7 @@ notmuch_search_command (notmuch_config_t *config, int argc, char *argv[]) + return EXIT_FAILURE; + } + +- ctx.query = notmuch_query_create (notmuch, query_str); ++ ctx.query = notmuch_query_create (ctx.notmuch, query_str); + if (ctx.query == NULL) { + fprintf (stderr, "Out of memory\n"); + return EXIT_FAILURE; +@@ -576,15 +579,15 @@ notmuch_search_command (notmuch_config_t *config, int argc, char *argv[]) + + notmuch_query_set_sort (ctx.query, ctx.sort); + +- if (exclude == NOTMUCH_EXCLUDE_FLAG && ctx.output != OUTPUT_SUMMARY) { ++ if (ctx.exclude == NOTMUCH_EXCLUDE_FLAG && ctx.output != OUTPUT_SUMMARY) { + /* If we are not doing summary output there is nowhere to + * print the excluded flag so fall back on including the + * excluded messages. */ + fprintf (stderr, "Warning: this output format cannot flag excluded messages.\n"); +- exclude = NOTMUCH_EXCLUDE_FALSE; ++ ctx.exclude = NOTMUCH_EXCLUDE_FALSE; + } + +- if (exclude != NOTMUCH_EXCLUDE_FALSE) { ++ if (ctx.exclude != NOTMUCH_EXCLUDE_FALSE) { + const char **search_exclude_tags; + size_t search_exclude_tags_length; + +@@ -592,7 +595,7 @@ notmuch_search_command (notmuch_config_t *config, int argc, char *argv[]) + (config, &search_exclude_tags_length); + for (i = 0; i < search_exclude_tags_length; i++) + notmuch_query_add_tag_exclude (ctx.query, search_exclude_tags[i]); +- notmuch_query_set_omit_excluded (ctx.query, exclude); ++ notmuch_query_set_omit_excluded (ctx.query, ctx.exclude); + } + + if (ctx.output == OUTPUT_SUMMARY || +@@ -603,14 +606,14 @@ notmuch_search_command (notmuch_config_t *config, int argc, char *argv[]) + (ctx.output & OUTPUT_ADDRESS_FLAGS && !(ctx.output & ~OUTPUT_ADDRESS_FLAGS))) + ret = do_search_messages (&ctx); + else if (ctx.output == OUTPUT_TAGS) +- ret = do_search_tags (notmuch, &ctx); ++ ret = do_search_tags (&ctx); + else { + fprintf (stderr, "Error: the combination of outputs is not supported.\n"); + ret = 1; + } + + notmuch_query_destroy (ctx.query); +- notmuch_database_destroy (notmuch); ++ notmuch_database_destroy (ctx.notmuch); + + talloc_free (ctx.format); + +-- +2.1.1 + -- 2.26.2