debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-25 04:18:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

cli: move count to the new --exclude=(true|false|flag) naming scheme.

Browse source 
Move the option --no-exclude to the --exclude= scheme. Since there is
no way to flag messages only true and false are implemented. Note
that, for consistency with other commands, this is implemented as a
keyword option rather than a boolean option.
This commit is contained in:
Mark Walters 2012-04-07 17:10:04 +01:00 committed by David Bremner
parent d6fbef4690
commit 785c1e497f
3 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
man/man1/notmuch-count.1
View file

@ -41,9 +41,10 @@ Output the number of matching threads.
.RS 4 .RS 4
.TP 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 .RE
.RE .RE

17
notmuch-count.c
View file

@ -26,6 +26,12 @@ enum {
OUTPUT_MESSAGES, OUTPUT_MESSAGES,
}; };
/* The following is to allow future options to be added more easily */
enum {
EXCLUDE_TRUE,
EXCLUDE_FALSE,
};
int int
notmuch_count_command (void *ctx, int argc, char *argv[]) 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; char *query_str;
int opt_index; int opt_index;
int output = OUTPUT_MESSAGES; int output = OUTPUT_MESSAGES;
notmuch_bool_t no_exclude = FALSE; int exclude = EXCLUDE_TRUE;
unsigned int i; unsigned int i;
notmuch_opt_desc_t options[] = { notmuch_opt_desc_t options[] = {
@ -43,7 +49,10 @@ notmuch_count_command (void *ctx, int argc, char *argv[])
(notmuch_keyword_t []){ { "threads", OUTPUT_THREADS }, (notmuch_keyword_t []){ { "threads", OUTPUT_THREADS },
{ "messages", OUTPUT_MESSAGES }, { "messages", OUTPUT_MESSAGES },
{ 0, 0 } } }, { 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 } { 0, 0, 0, 0, 0 }
}; };
@ -78,7 +87,7 @@ notmuch_count_command (void *ctx, int argc, char *argv[])
return 1; return 1;
} }
if (!no_exclude) { if (exclude == EXCLUDE_TRUE) {
const char **search_exclude_tags; const char **search_exclude_tags;
size_t search_exclude_tags_length; 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_add_tag_exclude (query, search_exclude_tags[i]);
} }
notmuch_query_set_omit_excluded_messages (query, TRUE);
switch (output) { switch (output) {
case OUTPUT_MESSAGES: case OUTPUT_MESSAGES:
printf ("%u\n", notmuch_query_count_messages (query)); printf ("%u\n", notmuch_query_count_messages (query));

4
test/count
View file

@ -53,9 +53,9 @@ test_expect_equal \
"1" \ "1" \
"`notmuch count subject:deleted and tag:deleted`" "`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 \ test_expect_equal \
"3" \ "3" \
"`notmuch count --no-exclude subject:deleted`" "`notmuch count --exclude=false subject:deleted`"
test_done test_done