[PATCH 1/7] cli: add --do-not-exclude option to count and search.
Mark Walters
markwalters1009 at gmail.com
Sun Jan 29 10:39:48 PST 2012
This option turns off the exclusion so all matching messages are
returned. We do not need to add this to show as notmuch-show does not
(yet) exclude.
---
notmuch-count.c | 12 ++++++++----
notmuch-search.c | 12 ++++++++----
2 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/notmuch-count.c b/notmuch-count.c
index 63459fb..c88975e 100644
--- a/notmuch-count.c
+++ b/notmuch-count.c
@@ -37,6 +37,7 @@ notmuch_count_command (void *ctx, int argc, char *argv[])
int output = OUTPUT_MESSAGES;
const char **search_exclude_tags;
size_t search_exclude_tags_length;
+ notmuch_bool_t do_not_exclude = FALSE;
unsigned int i;
notmuch_opt_desc_t options[] = {
@@ -44,6 +45,7 @@ notmuch_count_command (void *ctx, int argc, char *argv[])
(notmuch_keyword_t []){ { "threads", OUTPUT_THREADS },
{ "messages", OUTPUT_MESSAGES },
{ 0, 0 } } },
+ { NOTMUCH_OPT_BOOLEAN, &do_not_exclude, "do-not-exclude", 'd', 0 },
{ 0, 0, 0, 0, 0 }
};
@@ -78,10 +80,12 @@ notmuch_count_command (void *ctx, int argc, char *argv[])
return 1;
}
- 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]);
+ if (!do_not_exclude) {
+ 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]);
+ }
switch (output) {
case OUTPUT_MESSAGES:
diff --git a/notmuch-search.c b/notmuch-search.c
index d504051..084dd05 100644
--- a/notmuch-search.c
+++ b/notmuch-search.c
@@ -425,6 +425,7 @@ notmuch_search_command (void *ctx, int argc, char *argv[])
int limit = -1; /* unlimited */
const char **search_exclude_tags;
size_t search_exclude_tags_length;
+ notmuch_bool_t do_not_exclude = FALSE;
unsigned int i;
enum { NOTMUCH_FORMAT_JSON, NOTMUCH_FORMAT_TEXT }
@@ -446,6 +447,7 @@ notmuch_search_command (void *ctx, int argc, char *argv[])
{ "files", OUTPUT_FILES },
{ "tags", OUTPUT_TAGS },
{ 0, 0 } } },
+ { NOTMUCH_OPT_BOOLEAN, &do_not_exclude, "do-not-exclude", 'd', 0 },
{ NOTMUCH_OPT_INT, &offset, "offset", 'O', 0 },
{ NOTMUCH_OPT_INT, &limit, "limit", 'L', 0 },
{ 0, 0, 0, 0, 0 }
@@ -493,10 +495,12 @@ notmuch_search_command (void *ctx, int argc, char *argv[])
notmuch_query_set_sort (query, sort);
- 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]);
+ if (!do_not_exclude) {
+ 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]);
+ }
switch (output) {
default:
--
1.7.2.3
More information about the notmuch
mailing list