From 8f0fa578c68dc5b8b085509d16ad53f6aad6d055 Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Mon, 22 Sep 2014 11:37:55 +0200 Subject: [PATCH] [PATCH 1/5] cli: Refactor option passing in the search command --- 6b/a47104a0c86286008425141e4703e1ad02e3c9 | 354 ++++++++++++++++++++++ 1 file changed, 354 insertions(+) create mode 100644 6b/a47104a0c86286008425141e4703e1ad02e3c9 diff --git a/6b/a47104a0c86286008425141e4703e1ad02e3c9 b/6b/a47104a0c86286008425141e4703e1ad02e3c9 new file mode 100644 index 000000000..6517229e2 --- /dev/null +++ b/6b/a47104a0c86286008425141e4703e1ad02e3c9 @@ -0,0 +1,354 @@ +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 AA4DF431FC4 + for ; Mon, 22 Sep 2014 02:39:32 -0700 (PDT) +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 pn6wV4mUY5rd for ; + Mon, 22 Sep 2014 02:39:28 -0700 (PDT) +Received: from max.feld.cvut.cz (max.feld.cvut.cz [147.32.192.36]) + by olra.theworths.org (Postfix) with ESMTP id E8188431FB6 + for ; Mon, 22 Sep 2014 02:39:27 -0700 (PDT) +Received: from localhost (unknown [192.168.200.7]) + by max.feld.cvut.cz (Postfix) with ESMTP id 65A6E5CCE60; + Mon, 22 Sep 2014 11:39:27 +0200 (CEST) +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 4HFBvm9VwXgd; Mon, 22 Sep 2014 11:39:22 +0200 (CEST) +Received: from imap.feld.cvut.cz (imap.feld.cvut.cz [147.32.192.34]) + by max.feld.cvut.cz (Postfix) with ESMTP id 6321D5CCE61; + Mon, 22 Sep 2014 11:39:22 +0200 (CEST) +Received: from wsh by steelpick.2x.cz with local (Exim 4.84) + (envelope-from ) + id 1XW05U-0001w8-KN; Mon, 22 Sep 2014 11:39:16 +0200 +From: Michal Sojka +To: notmuch@notmuchmail.org +Subject: [PATCH 1/5] cli: Refactor option passing in the search command +Date: Mon, 22 Sep 2014 11:37:55 +0200 +Message-Id: <1411378679-7307-2-git-send-email-sojkam1@fel.cvut.cz> +X-Mailer: git-send-email 2.1.0 +In-Reply-To: <1411378679-7307-1-git-send-email-sojkam1@fel.cvut.cz> +References: <1411378679-7307-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: Mon, 22 Sep 2014 09:39:32 -0000 + +Many functions that implement the search command need to access command +line options. Instead of passing each option in a separate variable, put +them in a structure and pass only this structure. + +This will become handy in the following patches. +--- + notmuch-search.c | 122 ++++++++++++++++++++++++++++--------------------------- + 1 file changed, 62 insertions(+), 60 deletions(-) + +diff --git a/notmuch-search.c b/notmuch-search.c +index bc9be45..5ac2a26 100644 +--- a/notmuch-search.c ++++ b/notmuch-search.c +@@ -30,6 +30,16 @@ typedef enum { + OUTPUT_TAGS + } output_t; + ++typedef struct { ++ sprinter_t *format; ++ notmuch_query_t *query; ++ notmuch_sort_t sort; ++ output_t output; ++ int offset; ++ int limit; ++ int dupe; ++} search_options_t; ++ + /* Return two stable query strings that identify exactly the matched + * and unmatched messages currently in thread. If there are no + * matched or unmatched messages, the returned buffers will be +@@ -70,46 +80,42 @@ get_thread_query (notmuch_thread_t *thread, + } + + static int +-do_search_threads (sprinter_t *format, +- notmuch_query_t *query, +- notmuch_sort_t sort, +- output_t output, +- int offset, +- int limit) ++do_search_threads (search_options_t *o) + { + notmuch_thread_t *thread; + notmuch_threads_t *threads; + notmuch_tags_t *tags; ++ sprinter_t *format = o->format; + time_t date; + int i; + +- if (offset < 0) { +- offset += notmuch_query_count_threads (query); +- if (offset < 0) +- offset = 0; ++ if (o->offset < 0) { ++ o->offset += notmuch_query_count_threads (o->query); ++ if (o->offset < 0) ++ o->offset = 0; + } + +- threads = notmuch_query_search_threads (query); ++ threads = notmuch_query_search_threads (o->query); + if (threads == NULL) + return 1; + + format->begin_list (format); + + for (i = 0; +- notmuch_threads_valid (threads) && (limit < 0 || i < offset + limit); ++ notmuch_threads_valid (threads) && (o->limit < 0 || i < o->offset + o->limit); + notmuch_threads_move_to_next (threads), i++) + { + thread = notmuch_threads_get (threads); + +- if (i < offset) { ++ if (i < o->offset) { + notmuch_thread_destroy (thread); + continue; + } + +- if (output == OUTPUT_THREADS) { ++ if (o->output == OUTPUT_THREADS) { + format->set_prefix (format, "thread"); + format->string (format, +- notmuch_thread_get_thread_id (thread)); ++ notmuch_thread_get_thread_id (thread)); + format->separator (format); + } else { /* output == OUTPUT_SUMMARY */ + void *ctx_quote = talloc_new (thread); +@@ -123,7 +129,7 @@ do_search_threads (sprinter_t *format, + + format->begin_map (format); + +- if (sort == NOTMUCH_SORT_OLDEST_FIRST) ++ if (o->sort == NOTMUCH_SORT_OLDEST_FIRST) + date = notmuch_thread_get_oldest_date (thread); + else + date = notmuch_thread_get_newest_date (thread); +@@ -215,40 +221,36 @@ do_search_threads (sprinter_t *format, + } + + static int +-do_search_messages (sprinter_t *format, +- notmuch_query_t *query, +- output_t output, +- int offset, +- int limit, +- int dupe) ++do_search_messages (search_options_t *o) + { + notmuch_message_t *message; + notmuch_messages_t *messages; + notmuch_filenames_t *filenames; ++ sprinter_t *format = o->format; + int i; + +- if (offset < 0) { +- offset += notmuch_query_count_messages (query); +- if (offset < 0) +- offset = 0; ++ if (o->offset < 0) { ++ o->offset += notmuch_query_count_messages (o->query); ++ if (o->offset < 0) ++ o->offset = 0; + } + +- messages = notmuch_query_search_messages (query); ++ messages = notmuch_query_search_messages (o->query); + if (messages == NULL) + return 1; + + format->begin_list (format); + + for (i = 0; +- notmuch_messages_valid (messages) && (limit < 0 || i < offset + limit); ++ notmuch_messages_valid (messages) && (o->limit < 0 || i < o->offset + o->limit); + notmuch_messages_move_to_next (messages), i++) + { +- if (i < offset) ++ if (i < o->offset) + continue; + + message = notmuch_messages_get (messages); + +- if (output == OUTPUT_FILES) { ++ if (o->output == OUTPUT_FILES) { + int j; + filenames = notmuch_message_get_filenames (message); + +@@ -256,7 +258,7 @@ do_search_messages (sprinter_t *format, + notmuch_filenames_valid (filenames); + notmuch_filenames_move_to_next (filenames), j++) + { +- if (dupe < 0 || dupe == j) { ++ if (o->dupe < 0 || o->dupe == j) { + format->string (format, notmuch_filenames_get (filenames)); + format->separator (format); + } +@@ -333,16 +335,16 @@ int + notmuch_search_command (notmuch_config_t *config, int argc, char *argv[]) + { + notmuch_database_t *notmuch; +- notmuch_query_t *query; ++ search_options_t o = { ++ .sort = NOTMUCH_SORT_NEWEST_FIRST, ++ .output = OUTPUT_SUMMARY, ++ .offset = 0, ++ .limit = -1, /* unlimited */ ++ .dupe = -1, ++ }; + char *query_str; +- notmuch_sort_t sort = NOTMUCH_SORT_NEWEST_FIRST; +- sprinter_t *format = NULL; + int opt_index, ret; +- output_t output = OUTPUT_SUMMARY; +- int offset = 0; +- int limit = -1; /* unlimited */ + notmuch_exclude_t exclude = NOTMUCH_EXCLUDE_TRUE; +- int dupe = -1; + unsigned int i; + + enum { +@@ -353,7 +355,7 @@ notmuch_search_command (notmuch_config_t *config, int argc, char *argv[]) + } format_sel = NOTMUCH_FORMAT_TEXT; + + notmuch_opt_desc_t options[] = { +- { NOTMUCH_OPT_KEYWORD, &sort, "sort", 's', ++ { NOTMUCH_OPT_KEYWORD, &o.sort, "sort", 's', + (notmuch_keyword_t []){ { "oldest-first", NOTMUCH_SORT_OLDEST_FIRST }, + { "newest-first", NOTMUCH_SORT_NEWEST_FIRST }, + { 0, 0 } } }, +@@ -364,7 +366,7 @@ notmuch_search_command (notmuch_config_t *config, int argc, char *argv[]) + { "text0", NOTMUCH_FORMAT_TEXT0 }, + { 0, 0 } } }, + { NOTMUCH_OPT_INT, ¬much_format_version, "format-version", 0, 0 }, +- { NOTMUCH_OPT_KEYWORD, &output, "output", 'o', ++ { NOTMUCH_OPT_KEYWORD, &o.output, "output", 'o', + (notmuch_keyword_t []){ { "summary", OUTPUT_SUMMARY }, + { "threads", OUTPUT_THREADS }, + { "messages", OUTPUT_MESSAGES }, +@@ -377,9 +379,9 @@ notmuch_search_command (notmuch_config_t *config, int argc, char *argv[]) + { "flag", NOTMUCH_EXCLUDE_FLAG }, + { "all", NOTMUCH_EXCLUDE_ALL }, + { 0, 0 } } }, +- { NOTMUCH_OPT_INT, &offset, "offset", 'O', 0 }, +- { NOTMUCH_OPT_INT, &limit, "limit", 'L', 0 }, +- { NOTMUCH_OPT_INT, &dupe, "duplicate", 'D', 0 }, ++ { NOTMUCH_OPT_INT, &o.offset, "offset", 'O', 0 }, ++ { NOTMUCH_OPT_INT, &o.limit, "limit", 'L', 0 }, ++ { NOTMUCH_OPT_INT, &o.dupe, "duplicate", 'D', 0 }, + { 0, 0, 0, 0, 0 } + }; + +@@ -389,20 +391,20 @@ notmuch_search_command (notmuch_config_t *config, int argc, char *argv[]) + + switch (format_sel) { + case NOTMUCH_FORMAT_TEXT: +- format = sprinter_text_create (config, stdout); ++ o.format = sprinter_text_create (config, stdout); + break; + case NOTMUCH_FORMAT_TEXT0: +- if (output == OUTPUT_SUMMARY) { ++ if (o.output == OUTPUT_SUMMARY) { + fprintf (stderr, "Error: --format=text0 is not compatible with --output=summary.\n"); + return EXIT_FAILURE; + } +- format = sprinter_text0_create (config, stdout); ++ o.format = sprinter_text0_create (config, stdout); + break; + case NOTMUCH_FORMAT_JSON: +- format = sprinter_json_create (config, stdout); ++ o.format = sprinter_json_create (config, stdout); + break; + case NOTMUCH_FORMAT_SEXP: +- format = sprinter_sexp_create (config, stdout); ++ o.format = sprinter_sexp_create (config, stdout); + break; + default: + /* this should never happen */ +@@ -425,15 +427,15 @@ notmuch_search_command (notmuch_config_t *config, int argc, char *argv[]) + return EXIT_FAILURE; + } + +- query = notmuch_query_create (notmuch, query_str); +- if (query == NULL) { ++ o.query = notmuch_query_create (notmuch, query_str); ++ if (o.query == NULL) { + fprintf (stderr, "Out of memory\n"); + return EXIT_FAILURE; + } + +- notmuch_query_set_sort (query, sort); ++ notmuch_query_set_sort (o.query, o.sort); + +- if (exclude == NOTMUCH_EXCLUDE_FLAG && output != OUTPUT_SUMMARY) { ++ if (exclude == NOTMUCH_EXCLUDE_FLAG && o.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. */ +@@ -448,29 +450,29 @@ notmuch_search_command (notmuch_config_t *config, int argc, char *argv[]) + search_exclude_tags = notmuch_config_get_search_exclude_tags + (config, &search_exclude_tags_length); + for (i = 0; i < search_exclude_tags_length; i++) +- notmuch_query_add_tag_exclude (query, search_exclude_tags[i]); +- notmuch_query_set_omit_excluded (query, exclude); ++ notmuch_query_add_tag_exclude (o.query, search_exclude_tags[i]); ++ notmuch_query_set_omit_excluded (o.query, exclude); + } + +- switch (output) { ++ switch (o.output) { + default: + case OUTPUT_SUMMARY: + case OUTPUT_THREADS: +- ret = do_search_threads (format, query, sort, output, offset, limit); ++ ret = do_search_threads (&o); + break; + case OUTPUT_MESSAGES: + case OUTPUT_FILES: +- ret = do_search_messages (format, query, output, offset, limit, dupe); ++ ret = do_search_messages (&o); + break; + case OUTPUT_TAGS: +- ret = do_search_tags (notmuch, format, query); ++ ret = do_search_tags (notmuch, o.format, o.query); + break; + } + +- notmuch_query_destroy (query); ++ notmuch_query_destroy (o.query); + notmuch_database_destroy (notmuch); + +- talloc_free (format); ++ talloc_free (o.format); + + return ret ? EXIT_FAILURE : EXIT_SUCCESS; + } +-- +2.1.0 + -- 2.26.2