From 0fa6e21d8f832000945ad6aa352c9b0e6540c250 Mon Sep 17 00:00:00 2001 From: Mark Walters Date: Wed, 15 Feb 2012 09:03:38 +0000 Subject: [PATCH] [RFC PATCH v5 10/11] cli: omit excluded messages in results where appropriate. --- d9/84a0c1a79021837829054137c4ad357a00e51a | 150 ++++++++++++++++++++++ 1 file changed, 150 insertions(+) create mode 100644 d9/84a0c1a79021837829054137c4ad357a00e51a diff --git a/d9/84a0c1a79021837829054137c4ad357a00e51a b/d9/84a0c1a79021837829054137c4ad357a00e51a new file mode 100644 index 000000000..45c843314 --- /dev/null +++ b/d9/84a0c1a79021837829054137c4ad357a00e51a @@ -0,0 +1,150 @@ +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 3495441ED88 + for ; Wed, 15 Feb 2012 01:03:21 -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 Z9AV2aQQFUdO for ; + Wed, 15 Feb 2012 01:03:19 -0800 (PST) +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 C9FEC431E82 + for ; Wed, 15 Feb 2012 01:03:18 -0800 (PST) +Received: by mail-we0-f181.google.com with SMTP id p13so603332wer.26 + for ; Wed, 15 Feb 2012 01:03:18 -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=W5gWFpKFDk0cYcvFsue3qkq4xkV12E+Ahl6I/T4aQRk=; + b=HmL5g3pKdziCFkbNMDO7r69bsXcWi0oz2r2CBfkTqyES5tAakJ/ie8f7szGK2xxtNU + ho05mbQbC7eXTEQpzUcVL/SgA9KIUIRWCXz8ricjhqRJpnMlnBxNloMdSD5OgslBL8MK + u9KCXtRvgDOPLxubxm/6t0lYgmGVw0OGkpgRk= +Received: by 10.180.82.39 with SMTP id f7mr33843586wiy.19.1329296598586; + Wed, 15 Feb 2012 01:03:18 -0800 (PST) +Received: from localhost (94-192-233-223.zone6.bethere.co.uk. + [94.192.233.223]) by mx.google.com with ESMTPS id + s8sm32092059wiz.8.2012.02.15.01.03.17 (version=TLSv1/SSLv3 cipher=OTHER); + Wed, 15 Feb 2012 01:03:17 -0800 (PST) +From: Mark Walters +To: notmuch@notmuchmail.org +Subject: [RFC PATCH v5 10/11] cli: omit excluded messages in results where + appropriate. +Date: Wed, 15 Feb 2012 09:03:38 +0000 +Message-Id: <1329296619-7463-11-git-send-email-markwalters1009@gmail.com> +X-Mailer: git-send-email 1.7.2.3 +In-Reply-To: <1329296619-7463-1-git-send-email-markwalters1009@gmail.com> +References: <1329296619-7463-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: Wed, 15 Feb 2012 09:03:21 -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 43ec90b..d2b2488 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