diff options
| -rw-r--r-- | man/man1/notmuch-count.1 | 5 | ||||
| -rw-r--r-- | notmuch-count.c | 17 | ||||
| -rwxr-xr-x | test/count | 4 |
3 files changed, 17 insertions, 9 deletions
diff --git a/man/man1/notmuch-count.1 b/man/man1/notmuch-count.1 index 35ecc532..d6cbf074 100644 --- a/man/man1/notmuch-count.1 +++ b/man/man1/notmuch-count.1 @@ -41,9 +41,10 @@ Output the number of matching threads. .RS 4 .TP 4 -.BR \-\-no\-exclude +.BR \-\-exclude=(true|false) -Do not exclude the messages matching search.exclude_tags in the config file. +Specify whether to omit messages matching search.tag_exclude from the +count (the default) or not. .RE .RE .RE diff --git a/notmuch-count.c b/notmuch-count.c index 46b76ae1..b76690c0 100644 --- a/notmuch-count.c +++ b/notmuch-count.c @@ -26,6 +26,12 @@ enum { OUTPUT_MESSAGES, }; +/* The following is to allow future options to be added more easily */ +enum { + EXCLUDE_TRUE, + EXCLUDE_FALSE, +}; + int notmuch_count_command (void *ctx, int argc, char *argv[]) { @@ -35,7 +41,7 @@ notmuch_count_command (void *ctx, int argc, char *argv[]) char *query_str; int opt_index; int output = OUTPUT_MESSAGES; - notmuch_bool_t no_exclude = FALSE; + int exclude = EXCLUDE_TRUE; unsigned int i; notmuch_opt_desc_t options[] = { @@ -43,7 +49,10 @@ notmuch_count_command (void *ctx, int argc, char *argv[]) (notmuch_keyword_t []){ { "threads", OUTPUT_THREADS }, { "messages", OUTPUT_MESSAGES }, { 0, 0 } } }, - { NOTMUCH_OPT_BOOLEAN, &no_exclude, "no-exclude", 'd', 0 }, + { NOTMUCH_OPT_KEYWORD, &exclude, "exclude", 'x', + (notmuch_keyword_t []){ { "true", EXCLUDE_TRUE }, + { "false", EXCLUDE_FALSE }, + { 0, 0 } } }, { 0, 0, 0, 0, 0 } }; @@ -78,7 +87,7 @@ notmuch_count_command (void *ctx, int argc, char *argv[]) return 1; } - if (!no_exclude) { + if (exclude == EXCLUDE_TRUE) { const char **search_exclude_tags; size_t search_exclude_tags_length; @@ -88,8 +97,6 @@ notmuch_count_command (void *ctx, int argc, char *argv[]) notmuch_query_add_tag_exclude (query, search_exclude_tags[i]); } - notmuch_query_set_omit_excluded_messages (query, TRUE); - switch (output) { case OUTPUT_MESSAGES: printf ("%u\n", notmuch_query_count_messages (query)); @@ -53,9 +53,9 @@ test_expect_equal \ "1" \ "`notmuch count subject:deleted and tag:deleted`" -test_begin_subtest "count \"deleted\" messages, with --no-exclude" +test_begin_subtest "count \"deleted\" messages, --exclude=false" test_expect_equal \ "3" \ - "`notmuch count --no-exclude subject:deleted`" + "`notmuch count --exclude=false subject:deleted`" test_done |