cli: search: Convert --output to keyword argument

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.

diff --git a/doc/man1/notmuch-search.rst b/doc/man1/notmuch-search.rst
index 65df28878d6124294a17860ca8bf3b3448ff5876..0cc2911f7ff6c0865e164d7e16c04fa5e24cd6ff 100644 (file)
--- 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 69938d67be154302df04481329a8ba9124c7ac30..e084d258996cd97880969f81450a3af52300f332 100644 (file)
--- a/notmuch-search.c
+++ b/notmuch-search.c
@@ -587,7 +587,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 },
@@ -607,13 +607,11 @@ 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 (ctx->output != OUTPUT_FILES && ctx->output != OUTPUT_MESSAGES &&
        ctx->dupe != -1) {
         fprintf (stderr, "Error: --duplicate=N is only supported with --output=files and --output=messages.\n");
@@ -624,17 +622,20 @@ notmuch_search_command (notmuch_config_t *config, int argc, char *argv[])
                                 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);