From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id 2452142117D for ; Sat, 31 Mar 2012 15:54:20 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: 0.201 X-Spam-Level: X-Spam-Status: No, score=0.201 tagged_above=-999 required=5 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] 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 sMFLIDUumSE8 for ; Sat, 31 Mar 2012 15:54:18 -0700 (PDT) Received: from mail-we0-f181.google.com (mail-we0-f181.google.com [74.125.82.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id 653D9421175 for ; Sat, 31 Mar 2012 15:54:15 -0700 (PDT) Received: by mail-we0-f181.google.com with SMTP id m13so1257125wer.26 for ; Sat, 31 Mar 2012 15:54:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=4kNEFjZwCNgW5LnkBuans2CaPXaVe3AX9S/dAJN4UjY=; b=N1pqRf3arHHkd1+zHiOxriJGAFbwY5Mu7zhkdRnOEXKlUoKGq/i4zdbs1d9lbgRpcz ephlZAkECfgLza41hGM/psDKbQGakERUS0xwggbETABoaDzbtPjjTS9OuSWFoQt8XDpT uDYEEYQihUBpaZd0jHnO6aSWD/PETjsmmoOJm2Ll1xK2NH2ijB1+ouHKK1z+Q/X6t4X5 Uf73oS6UN5d+Rs+fyx7ieezr+y0eJ8fVEJg/LikHwvHGBKuJBVSbO8MDWMc5u3OFDnr2 Uv3jFAPEQqhVma7vngdFshO0Pe/OERM4UbxOuvK0iSgh4snJ/5ecou3Bi3EZ0PO+wdO1 RvDw== Received: by 10.180.79.135 with SMTP id j7mr10383296wix.19.1333234455061; Sat, 31 Mar 2012 15:54:15 -0700 (PDT) Received: from localhost (94-192-233-223.zone6.bethere.co.uk. [94.192.233.223]) by mx.google.com with ESMTPS id e6sm19991783wix.8.2012.03.31.15.54.13 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 31 Mar 2012 15:54:14 -0700 (PDT) From: Mark Walters To: notmuch@notmuchmail.org Subject: [PATCH v2 3/6] cli: move search to the new --exclude= naming scheme. Date: Sat, 31 Mar 2012 23:53:59 +0100 Message-Id: <1333234442-28616-4-git-send-email-markwalters1009@gmail.com> X-Mailer: git-send-email 1.7.9.1 In-Reply-To: <1333234442-28616-1-git-send-email-markwalters1009@gmail.com> References: <1333234442-28616-1-git-send-email-markwalters1009@gmail.com> 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: Sat, 31 Mar 2012 22:54:20 -0000 This commit replaces the --no-exclude option with a --exclude=(true|false|flag) option. The default is to omit the excluded messages. The flag option only makes sense if output=summary (as otherwise there is nowhere to print the flag). In summary output exclude=false and exclude=flag give almost identical output: they differ in that with the exclude=flag option the match count (i.e., the x in [x/n] in the output) is the number of matching non-excluded messages rather than the number of matching messages. Note this changes the default for output=summary when no --exclude= option is given: it used to default to flag and now defaults to true (i.e. omit excluded messages). This is neccesary to keep the cli output uncluttered and for speed reasons. --- man/man1/notmuch-search.1 | 12 +++++++++--- notmuch-search.c | 32 +++++++++++++++++++++++--------- 2 files changed, 32 insertions(+), 12 deletions(-) diff --git a/man/man1/notmuch-search.1 b/man/man1/notmuch-search.1 index 06d81a6..ebb61fc 100644 --- a/man/man1/notmuch-search.1 +++ b/man/man1/notmuch-search.1 @@ -114,9 +114,15 @@ Limit the number of displayed results to N. .RS 4 .TP 4 -.BR \-\-no\-exclude - -Do not exclude the messages matching search.exclude_tags in the config file. +.BR \-\-exclude=(true|false|flag) + +Specify whether to omit messages matching search.tag_exclude from the +search results (the default) or not. The extra option +.B flag +only has an effect when +.B --output=summary +In this case all matching threads are returned but the "match count" +is the number of matching non-excluded messages in the thread. .RE .SH SEE ALSO diff --git a/notmuch-search.c b/notmuch-search.c index f6061e4..fe18a93 100644 --- a/notmuch-search.c +++ b/notmuch-search.c @@ -210,9 +210,6 @@ do_search_threads (const search_format_t *format, int first_thread = 1; int i; - if (output == OUTPUT_THREADS) - notmuch_query_set_omit_excluded_messages (query, TRUE); - if (offset < 0) { offset += notmuch_query_count_threads (query); if (offset < 0) @@ -303,8 +300,6 @@ do_search_messages (const search_format_t *format, int first_message = 1; int i; - notmuch_query_set_omit_excluded_messages (query, TRUE); - if (offset < 0) { offset += notmuch_query_count_messages (query); if (offset < 0) @@ -376,7 +371,6 @@ do_search_tags (notmuch_database_t *notmuch, const char *tag; int first_tag = 1; - notmuch_query_set_omit_excluded_messages (query, TRUE); /* should the following only special case if no excluded terms * specified? */ @@ -422,6 +416,12 @@ do_search_tags (notmuch_database_t *notmuch, return 0; } +enum { + EXCLUDE_TRUE, + EXCLUDE_FALSE, + EXCLUDE_FLAG, +}; + int notmuch_search_command (void *ctx, int argc, char *argv[]) { @@ -435,7 +435,7 @@ notmuch_search_command (void *ctx, int argc, char *argv[]) output_t output = OUTPUT_SUMMARY; int offset = 0; int limit = -1; /* unlimited */ - notmuch_bool_t no_exclude = FALSE; + int exclude = EXCLUDE_TRUE; unsigned int i; enum { NOTMUCH_FORMAT_JSON, NOTMUCH_FORMAT_TEXT } @@ -457,7 +457,11 @@ notmuch_search_command (void *ctx, int argc, char *argv[]) { "files", OUTPUT_FILES }, { "tags", OUTPUT_TAGS }, { 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 }, + { "flag", EXCLUDE_FLAG }, + { 0, 0 } } }, { NOTMUCH_OPT_INT, &offset, "offset", 'O', 0 }, { NOTMUCH_OPT_INT, &limit, "limit", 'L', 0 }, { 0, 0, 0, 0, 0 } @@ -505,7 +509,15 @@ notmuch_search_command (void *ctx, int argc, char *argv[]) notmuch_query_set_sort (query, sort); - if (!no_exclude) { + if (exclude == EXCLUDE_FLAG && output != OUTPUT_SUMMARY) { + /* if we are not doing summary output there is no where to + * print the excluded flag so fall back on including the + * excluded messages */ + fprintf (stderr, "Cannot flag excluded messages with this output: fall back on just including them\n"); + exclude = EXCLUDE_FALSE; + } + + if (exclude == EXCLUDE_TRUE || exclude == EXCLUDE_FLAG) { const char **search_exclude_tags; size_t search_exclude_tags_length; @@ -513,6 +525,8 @@ notmuch_search_command (void *ctx, int argc, char *argv[]) (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 (exclude == EXCLUDE_FLAG) + notmuch_query_set_omit_excluded_messages (query, FALSE); } switch (output) { -- 1.7.9.1