From: Michal Sojka Date: Sun, 2 Nov 2014 00:49:57 +0000 (+0100) Subject: [PATCH 07/10] cli: search: Convert --output to keyword argument X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6f85837e651ad1a41ac2b6f6ae5489f3f973ea89;p=notmuch-archives.git [PATCH 07/10] cli: search: Convert --output to keyword argument --- diff --git a/00/4f45ea7a09843846463b1fe72d4fd1aca8e8c2 b/00/4f45ea7a09843846463b1fe72d4fd1aca8e8c2 new file mode 100644 index 000000000..4de6b4890 --- /dev/null +++ b/00/4f45ea7a09843846463b1fe72d4fd1aca8e8c2 @@ -0,0 +1,135 @@ +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 CD248429E37 + for ; Sat, 1 Nov 2014 17:50:23 -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 I-gqKuylkl8w for ; + Sat, 1 Nov 2014 17:50:18 -0700 (PDT) +Received: from max.feld.cvut.cz (max.feld.cvut.cz [147.32.192.36]) + by olra.theworths.org (Postfix) with ESMTP id 59976431FD9 + for ; Sat, 1 Nov 2014 17:50:13 -0700 (PDT) +Received: from localhost (unknown [192.168.200.7]) + by max.feld.cvut.cz (Postfix) with ESMTP id 475765CD297 + for ; Sun, 2 Nov 2014 01:50:12 +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 CyYUXw47bgNb for ; + Sun, 2 Nov 2014 01:50:07 +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 8D15E5CD28F + for ; Sun, 2 Nov 2014 01:50:06 +0100 (CET) +Received: from wsh by steelpick.2x.cz with local (Exim 4.84) + (envelope-from ) + id 1XkjMq-00085G-IW; Sun, 02 Nov 2014 01:50:04 +0100 +From: Michal Sojka +To: notmuch@notmuchmail.org +Subject: [PATCH 07/10] cli: search: Convert --output to keyword argument +Date: Sun, 2 Nov 2014 01:49:57 +0100 +Message-Id: <1414889400-30977-8-git-send-email-sojkam1@fel.cvut.cz> +X-Mailer: git-send-email 2.1.1 +In-Reply-To: <1414889400-30977-1-git-send-email-sojkam1@fel.cvut.cz> +References: <1414889400-30977-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: Sun, 02 Nov 2014 00:50:24 -0000 + +Now, when address related outputs are in a separate command, it makes +no sense to combine multiple --output options in search command line. +Using switch statement to handle different outputs is more readable +than a series of if statements. +--- + doc/man1/notmuch-search.rst | 3 --- + notmuch-search.c | 25 +++++++++++++------------ + 2 files changed, 13 insertions(+), 15 deletions(-) + +diff --git a/doc/man1/notmuch-search.rst b/doc/man1/notmuch-search.rst +index e919811..e7b5ad4 100644 +--- a/doc/man1/notmuch-search.rst ++++ b/doc/man1/notmuch-search.rst +@@ -78,9 +78,6 @@ Supported options for **search** include + by null characters (--format=text0), as a JSON array + (--format=json), or as an S-Expression list (--format=sexp). + +- This option can be given multiple times to combine different +- outputs. +- + ``--sort=``\ (**newest-first**\ \|\ **oldest-first**) + This option can be used to present results in either + chronological order (**oldest-first**) or reverse chronological +diff --git a/notmuch-search.c b/notmuch-search.c +index 7a78ecd..4b9a372 100644 +--- a/notmuch-search.c ++++ b/notmuch-search.c +@@ -572,7 +572,7 @@ notmuch_search_command (notmuch_config_t *config, int argc, char *argv[]) + int opt_index, ret; + + notmuch_opt_desc_t options[] = { +- { NOTMUCH_OPT_KEYWORD_FLAGS, &ctx->output, "output", 'o', ++ { NOTMUCH_OPT_KEYWORD, &ctx->output, "output", 'o', + (notmuch_keyword_t []){ { "summary", OUTPUT_SUMMARY }, + { "threads", OUTPUT_THREADS }, + { "messages", OUTPUT_MESSAGES }, +@@ -586,28 +586,29 @@ notmuch_search_command (notmuch_config_t *config, int argc, char *argv[]) + { 0, 0, 0, 0, 0 } + }; + ++ ctx->output = OUTPUT_SUMMARY; + opt_index = parse_arguments (argc, argv, options, 1); + if (opt_index < 0) + return EXIT_FAILURE; + +- if (! ctx->output) +- ctx->output = OUTPUT_SUMMARY; +- + if (_notmuch_search_prepare (ctx, config, + argc - opt_index, argv + opt_index)) + return EXIT_FAILURE; + +- if (ctx->output == OUTPUT_SUMMARY || +- ctx->output == OUTPUT_THREADS) ++ switch (ctx->output) { ++ case OUTPUT_SUMMARY: ++ case OUTPUT_THREADS: + ret = do_search_threads (ctx); +- else if (ctx->output == OUTPUT_MESSAGES || +- ctx->output == OUTPUT_FILES) ++ break; ++ case OUTPUT_MESSAGES: ++ case OUTPUT_FILES: + ret = do_search_messages (ctx); +- else if (ctx->output == OUTPUT_TAGS) ++ break; ++ case OUTPUT_TAGS: + ret = do_search_tags (ctx); +- else { +- fprintf (stderr, "Error: the combination of outputs is not supported.\n"); +- ret = 1; ++ break; ++ default: ++ INTERNAL_ERROR ("Unexpected output"); + } + + _notmuch_search_cleanup (ctx); +-- +2.1.1 +