From 1d06536b7d58334bc77418edacb43806c59c1285 Mon Sep 17 00:00:00 2001 From: Mark Walters Date: Sat, 25 Feb 2012 08:06:42 +0000 Subject: [PATCH] [Patch v6 11/13] cli: omit excluded messages in results where appropriate. --- be/5a703a810ccc23921ffecf450f6ee0bf7b2905 | 160 ++++++++++++++++++++++ 1 file changed, 160 insertions(+) create mode 100644 be/5a703a810ccc23921ffecf450f6ee0bf7b2905 diff --git a/be/5a703a810ccc23921ffecf450f6ee0bf7b2905 b/be/5a703a810ccc23921ffecf450f6ee0bf7b2905 new file mode 100644 index 000000000..b08cb98ee --- /dev/null +++ b/be/5a703a810ccc23921ffecf450f6ee0bf7b2905 @@ -0,0 +1,160 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 8FF75429E54 + for ; Sat, 25 Feb 2012 19:07:30 -0800 (PST) +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 PSKCk53cUydo for ; + Sat, 25 Feb 2012 19:07:29 -0800 (PST) +Received: from mail-ww0-f41.google.com (mail-ww0-f41.google.com + [74.125.82.41]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client + certificate requested) by olra.theworths.org (Postfix) with ESMTPS id + 24D2341806C for ; Sat, 25 Feb 2012 18:50:54 -0800 + (PST) +Received: by wgbds1 with SMTP id ds1so230173wgb.2 + for ; Sat, 25 Feb 2012 18:50:51 -0800 (PST) +Received-SPF: pass (google.com: domain of markwalters1009@gmail.com designates + 10.180.107.169 as permitted sender) client-ip=10.180.107.169; +Authentication-Results: mr.google.com; spf=pass (google.com: domain of + markwalters1009@gmail.com designates 10.180.107.169 as + permitted sender) smtp.mail=markwalters1009@gmail.com; + dkim=pass header.i=markwalters1009@gmail.com +Received: from mr.google.com ([10.180.107.169]) + by 10.180.107.169 with SMTP id hd9mr7283065wib.0.1330224651743 + (num_hops = 1); Sat, 25 Feb 2012 18:50:51 -0800 (PST) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; + h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; + bh=SMyRo6NKb+fBzZo1Wm85RVSEOlk9yEp6ESwsayulzUk=; + b=OC99sSEZXNI0TWCPDbs/diYS3owuWxupKK1OWjdW2lHWlrca348z4pP7NtJqZMsUt3 + 24DV0dMbAOd4/OMiGH6dWBkkRePHjcVUkITIuqaDOqqYED9Yu3kuz8P0OAt88e9WleKu + SyxwfCYcW+DBmDqTqHtBpJAIzm5o1iPB/ap3Y= +Received: by 10.180.107.169 with SMTP id hd9mr1481257wib.0.1330157151673; + Sat, 25 Feb 2012 00:05:51 -0800 (PST) +Received: from localhost (94-192-233-223.zone6.bethere.co.uk. + [94.192.233.223]) by mx.google.com with ESMTPS id + h19sm8198804wiw.9.2012.02.25.00.05.50 (version=TLSv1/SSLv3 cipher=OTHER); + Sat, 25 Feb 2012 00:05:51 -0800 (PST) +From: Mark Walters +To: notmuch@notmuchmail.org, + Austin Clements +Subject: [Patch v6 11/13] cli: omit excluded messages in results where + appropriate. +Date: Sat, 25 Feb 2012 08:06:42 +0000 +Message-Id: <1330157204-26094-12-git-send-email-markwalters1009@gmail.com> +X-Mailer: git-send-email 1.7.2.3 +In-Reply-To: <1330157204-26094-1-git-send-email-markwalters1009@gmail.com> +References: <1330157204-26094-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: Sun, 26 Feb 2012 03:07:30 -0000 + +In all cases of notmuch count/search/show where the results returned +cannot reflect the exclude flag return just the matched not-excluded +results. If the caller wishes to have all the matched results (i.e., +including the excluded ones) they should call with the +--no-exclude option. + +The relevant cases are + count: both threads and messages + search: all cases except the summary view + show: mbox format +--- + notmuch-count.c | 2 ++ + notmuch-search.c | 9 +++++++++ + notmuch-show.c | 6 ++++++ + 3 files changed, 17 insertions(+), 0 deletions(-) + +diff --git a/notmuch-count.c b/notmuch-count.c +index 5364507..46b76ae 100644 +--- a/notmuch-count.c ++++ b/notmuch-count.c +@@ -88,6 +88,8 @@ 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)); +diff --git a/notmuch-search.c b/notmuch-search.c +index d1c5553..61c65e5 100644 +--- a/notmuch-search.c ++++ b/notmuch-search.c +@@ -207,6 +207,9 @@ 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) +@@ -297,6 +300,8 @@ 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) +@@ -368,6 +373,10 @@ 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? */ ++ + /* Special-case query of "*" for better performance. */ + if (strcmp (notmuch_query_get_query_string (query), "*") == 0) { + tags = notmuch_database_get_all_tags (notmuch); +diff --git a/notmuch-show.c b/notmuch-show.c +index 2a634e9..17a4ec6 100644 +--- a/notmuch-show.c ++++ b/notmuch-show.c +@@ -1080,6 +1080,7 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[])) + fprintf (stderr, "Error: specifying parts is incompatible with mbox output format.\n"); + return 1; + } ++ + format = &format_mbox; + break; + case NOTMUCH_FORMAT_RAW: +@@ -1137,6 +1138,11 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[])) + return 1; + } + ++ /* if format=mbox then we can not output excluded messages as ++ * there is no way to make the exclude flag available */ ++ if (format_sel == NOTMUCH_FORMAT_MBOX) ++ notmuch_query_set_omit_excluded_messages (query, TRUE); ++ + /* If a single message is requested we do not use search_excludes. */ + if (params.part >= 0) + ret = do_show_single (ctx, query, format, ¶ms); +-- +1.7.2.3 + -- 2.26.2