From 1845b84196a77aad47f3d6e4cc3e2aa1976d1b34 Mon Sep 17 00:00:00 2001 From: Mark Walters Date: Thu, 2 Feb 2012 17:43:38 +0000 Subject: [PATCH] [PATCH v4 10/11] cli: omit excluded messages in results where appropriate. --- 5c/212cca34190f49a865fa432f1d591404fd314f | 143 ++++++++++++++++++++++ 1 file changed, 143 insertions(+) create mode 100644 5c/212cca34190f49a865fa432f1d591404fd314f diff --git a/5c/212cca34190f49a865fa432f1d591404fd314f b/5c/212cca34190f49a865fa432f1d591404fd314f new file mode 100644 index 000000000..240c86686 --- /dev/null +++ b/5c/212cca34190f49a865fa432f1d591404fd314f @@ -0,0 +1,143 @@ +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 38B4F431FDB + for ; Thu, 2 Feb 2012 09:43:38 -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 FRR3kzRwo01z for ; + Thu, 2 Feb 2012 09:43:37 -0800 (PST) +Received: from mail-ww0-f45.google.com (mail-ww0-f45.google.com + [74.125.82.45]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client + certificate requested) by olra.theworths.org (Postfix) with ESMTPS id + C4B65429E29 for ; Thu, 2 Feb 2012 09:43:18 -0800 + (PST) +Received: by mail-ww0-f45.google.com with SMTP id dt12so2522817wgb.2 + for ; Thu, 02 Feb 2012 09:43: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=O97wCa0n7XsK6R6wcr4EphxC/rgAff6CB3dulJaU7Ns=; + b=PNUpNBzjfIDsUCqOOsagne/SDF5xz27y9zTFg0emwlSHRwmagg9JTyMqbJVlFzwG14 + nOeesn5hqWKK3J3q6ZxjF50JyBUOsXrQCwtu1Ugyh4dQ385KSrHaBSBPdOwFnDuoM72F + SHNRCRVRGlL4TUPC8bF15awpG8LY9cWo7XdrU= +Received: by 10.180.100.228 with SMTP id fb4mr6263865wib.1.1328204598461; + Thu, 02 Feb 2012 09:43: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 + q2sm1127404wiy.7.2012.02.02.09.43.16 (version=TLSv1/SSLv3 cipher=OTHER); Thu, + 02 Feb 2012 09:43:17 -0800 (PST) +From: Mark Walters +To: notmuch@notmuchmail.org, + amdragon@MIT.EDU +Subject: [PATCH v4 10/11] cli: omit excluded messages in results where + appropriate. +Date: Thu, 2 Feb 2012 17:43:38 +0000 +Message-Id: <1328204619-25046-10-git-send-email-markwalters1009@gmail.com> +X-Mailer: git-send-email 1.7.2.3 +In-Reply-To: <874nv9rv79.fsf@qmul.ac.uk> +References: <874nv9rv79.fsf@qmul.ac.uk> +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: Thu, 02 Feb 2012 17:43:38 -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 | 5 +++++ + 3 files changed, 16 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 108f13b..924e7ea 100644 +--- a/notmuch-show.c ++++ b/notmuch-show.c +@@ -1166,6 +1166,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 (mbox) ++ notmuch_query_set_omit_excluded_messages (query, TRUE); ++ + /* if part was requested and format was not specified, use format=raw */ + if (params.part >= 0 && !format_specified) + format = &format_raw; +-- +1.7.2.3 + -- 2.26.2