From c1b579998980b853d7519b4e0e92dc2d8c687492 Mon Sep 17 00:00:00 2001 From: Mark Walters Date: Sat, 11 May 2013 20:50:02 +0100 Subject: [PATCH] [PATCH v2 1/8] lib: add --exclude=all option --- 5a/1ff0d7c13d396256977eeec1b243b1e6d92ea2 | 263 ++++++++++++++++++++++ 1 file changed, 263 insertions(+) create mode 100644 5a/1ff0d7c13d396256977eeec1b243b1e6d92ea2 diff --git a/5a/1ff0d7c13d396256977eeec1b243b1e6d92ea2 b/5a/1ff0d7c13d396256977eeec1b243b1e6d92ea2 new file mode 100644 index 000000000..a85cf32e4 --- /dev/null +++ b/5a/1ff0d7c13d396256977eeec1b243b1e6d92ea2 @@ -0,0 +1,263 @@ +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 96FE9431FBF + for ; Sat, 11 May 2013 12:50:23 -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 at+M0KZJC3+1 for ; + Sat, 11 May 2013 12:50:19 -0700 (PDT) +Received: from mail-wg0-f48.google.com (mail-wg0-f48.google.com + [74.125.82.48]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client + certificate requested) by olra.theworths.org (Postfix) with ESMTPS id + 1E5DC431FB6 for ; Sat, 11 May 2013 12:50:19 -0700 + (PDT) +Received: by mail-wg0-f48.google.com with SMTP id f11so4948975wgh.15 + for ; Sat, 11 May 2013 12:50:18 -0700 (PDT) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; + h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to + :references; bh=1tDQM0WjNlAQ4cO/Ceu+n+nWdPzbyVDxVqBbWd81u4w=; + b=p4dR0+GCiaJ6r66Zy62Umd5v1e22AINkygOW3GsBZKYJT7izsSPaaBsfH2ePlcIogk + PnOnxgQCaOEgYft2IRASRSLZkzagTOXnCMXbVeo7gz74DQXJ/lOcIUsSnujc1FLsdJOu + GU/gBrpG1XVC1rEBAaU2QTNofX2PE2tmxbpWOxXFsPNoVYmPjqeCwIK89NRUxths3tdg + 8PCq2sEB/zTpcZwX7d2nNH1kOvXdICnYTdcuoZUMG9f5fWLSXgzwWeRwA2JyBRDacc9c + /bBus/feK74hv/Nax3KL1duCn0ZbygpOHC6W6OXsAzrjFmaZr8WaQtA2Uc5VR5oPEVvN + o1pg== +X-Received: by 10.194.236.198 with SMTP id uw6mr27111099wjc.33.1368301818043; + Sat, 11 May 2013 12:50:18 -0700 (PDT) +Received: from localhost (93-97-24-31.zone5.bethere.co.uk. [93.97.24.31]) + by mx.google.com with ESMTPSA id e8sm5678677wic.5.2013.05.11.12.50.16 + for + (version=TLSv1.2 cipher=RC4-SHA bits=128/128); + Sat, 11 May 2013 12:50:17 -0700 (PDT) +From: Mark Walters +To: notmuch@notmuchmail.org +Subject: [PATCH v2 1/8] lib: add --exclude=all option +Date: Sat, 11 May 2013 20:50:02 +0100 +Message-Id: <1368301809-12532-2-git-send-email-markwalters1009@gmail.com> +X-Mailer: git-send-email 1.7.9.1 +In-Reply-To: <1368301809-12532-1-git-send-email-markwalters1009@gmail.com> +References: <1368301809-12532-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, 11 May 2013 19:50:23 -0000 + +Adds a exclude all option to the lib which means that excluded +messages are completely ignored (as if they had actually been +deleted). +--- + lib/notmuch-private.h | 1 + + lib/notmuch.h | 22 +++++++++++++++------- + lib/query.cc | 10 ++++++---- + lib/thread.cc | 41 ++++++++++++++++++++++++++++++----------- + 4 files changed, 52 insertions(+), 22 deletions(-) + +diff --git a/lib/notmuch-private.h b/lib/notmuch-private.h +index f38ccb3..cc55bb9 100644 +--- a/lib/notmuch-private.h ++++ b/lib/notmuch-private.h +@@ -236,6 +236,7 @@ _notmuch_thread_create (void *ctx, + unsigned int seed_doc_id, + notmuch_doc_id_set_t *match_set, + notmuch_string_list_t *excluded_terms, ++ notmuch_exclude_t omit_exclude, + notmuch_sort_t sort); + + /* message.cc */ +diff --git a/lib/notmuch.h b/lib/notmuch.h +index 3739336..27b43ff 100644 +--- a/lib/notmuch.h ++++ b/lib/notmuch.h +@@ -500,14 +500,22 @@ typedef enum { + const char * + notmuch_query_get_query_string (notmuch_query_t *query); + ++/* Exclude values for notmuch_query_set_omit_excluded */ ++typedef enum { ++ NOTMUCH_EXCLUDE_FALSE, ++ NOTMUCH_EXCLUDE_TRUE, ++ NOTMUCH_EXCLUDE_ALL ++} notmuch_exclude_t; ++ + /* Specify whether to omit excluded results or simply flag them. By + * default, this is set to TRUE. + * +- * If this is TRUE, notmuch_query_search_messages will omit excluded +- * messages from the results. notmuch_query_search_threads will omit +- * threads that match only in excluded messages, but will include all +- * messages in threads that match in at least one non-excluded +- * message. ++ * If set to TRUE or ALL, notmuch_query_search_messages will omit excluded ++ * messages from the results, and notmuch_query_search_threads will omit ++ * threads that match only in excluded messages. If set to TRUE, ++ * notmuch_query_search_threads will include all messages in threads that ++ * match in at least one non-excluded message. Otherwise, if set to ALL, ++ * notmuch_query_search_threads will omit excluded messages from all threads. + * + * The performance difference when calling + * notmuch_query_search_messages should be relatively small (and both +@@ -516,9 +524,9 @@ notmuch_query_get_query_string (notmuch_query_t *query); + * excluded messages as it does not need to construct the threads that + * only match in excluded messages. + */ +- + void +-notmuch_query_set_omit_excluded (notmuch_query_t *query, notmuch_bool_t omit_excluded); ++notmuch_query_set_omit_excluded (notmuch_query_t *query, ++ notmuch_exclude_t omit_excluded); + + /* Specify the sorting desired for this query. */ + void +diff --git a/lib/query.cc b/lib/query.cc +index 7381a54..1cc768f 100644 +--- a/lib/query.cc ++++ b/lib/query.cc +@@ -28,7 +28,7 @@ struct _notmuch_query { + const char *query_string; + notmuch_sort_t sort; + notmuch_string_list_t *exclude_terms; +- notmuch_bool_t omit_excluded; ++ notmuch_exclude_t omit_excluded; + }; + + typedef struct _notmuch_mset_messages { +@@ -92,7 +92,7 @@ notmuch_query_create (notmuch_database_t *notmuch, + + query->exclude_terms = _notmuch_string_list_create (query); + +- query->omit_excluded = TRUE; ++ query->omit_excluded = NOTMUCH_EXCLUDE_TRUE; + + return query; + } +@@ -104,7 +104,8 @@ notmuch_query_get_query_string (notmuch_query_t *query) + } + + void +-notmuch_query_set_omit_excluded (notmuch_query_t *query, notmuch_bool_t omit_excluded) ++notmuch_query_set_omit_excluded (notmuch_query_t *query, ++ notmuch_exclude_t omit_excluded) + { + query->omit_excluded = omit_excluded; + } +@@ -220,7 +221,7 @@ notmuch_query_search_messages (notmuch_query_t *query) + if (query->exclude_terms) { + exclude_query = _notmuch_exclude_tags (query, final_query); + +- if (query->omit_excluded) ++ if (query->omit_excluded != NOTMUCH_EXCLUDE_FALSE) + final_query = Xapian::Query (Xapian::Query::OP_AND_NOT, + final_query, exclude_query); + else { +@@ -486,6 +487,7 @@ notmuch_threads_get (notmuch_threads_t *threads) + doc_id, + &threads->match_set, + threads->query->exclude_terms, ++ threads->query->omit_excluded, + threads->query->sort); + } + +diff --git a/lib/thread.cc b/lib/thread.cc +index 50bdef1..bc07877 100644 +--- a/lib/thread.cc ++++ b/lib/thread.cc +@@ -227,7 +227,8 @@ _thread_cleanup_author (notmuch_thread_t *thread, + static void + _thread_add_message (notmuch_thread_t *thread, + notmuch_message_t *message, +- notmuch_string_list_t *exclude_terms) ++ notmuch_string_list_t *exclude_terms, ++ notmuch_exclude_t omit_exclude) + { + notmuch_tags_t *tags; + const char *tag; +@@ -235,6 +236,28 @@ _thread_add_message (notmuch_thread_t *thread, + InternetAddress *address; + const char *from, *author; + char *clean_author; ++ notmuch_bool_t message_excluded = FALSE; ++ ++ for (tags = notmuch_message_get_tags (message); ++ notmuch_tags_valid (tags); ++ notmuch_tags_move_to_next (tags)) ++ { ++ tag = notmuch_tags_get (tags); ++ /* Is message excluded? */ ++ for (notmuch_string_node_t *term = exclude_terms->head; ++ term != NULL; ++ term = term->next) ++ { ++ /* We ignore initial 'K'. */ ++ if (strcmp(tag, (term->string + 1)) == 0) { ++ message_excluded = TRUE; ++ break; ++ } ++ } ++ } ++ ++ if (message_excluded && omit_exclude == NOTMUCH_EXCLUDE_ALL) ++ return; + + _notmuch_message_list_add_message (thread->message_list, + talloc_steal (thread, message)); +@@ -275,17 +298,12 @@ _thread_add_message (notmuch_thread_t *thread, + notmuch_tags_move_to_next (tags)) + { + tag = notmuch_tags_get (tags); +- /* Mark excluded messages. */ +- for (notmuch_string_node_t *term = exclude_terms->head; term; +- term = term->next) { +- /* We ignore initial 'K'. */ +- if (strcmp(tag, (term->string + 1)) == 0) { +- notmuch_message_set_flag (message, NOTMUCH_MESSAGE_FLAG_EXCLUDED, TRUE); +- break; +- } +- } + g_hash_table_insert (thread->tags, xstrdup (tag), NULL); + } ++ ++ /* Mark excluded messages. */ ++ if (message_excluded) ++ notmuch_message_set_flag (message, NOTMUCH_MESSAGE_FLAG_EXCLUDED, TRUE); + } + + static void +@@ -409,6 +427,7 @@ _notmuch_thread_create (void *ctx, + unsigned int seed_doc_id, + notmuch_doc_id_set_t *match_set, + notmuch_string_list_t *exclude_terms, ++ notmuch_exclude_t omit_excluded, + notmuch_sort_t sort) + { + void *local = talloc_new (ctx); +@@ -488,7 +507,7 @@ _notmuch_thread_create (void *ctx, + if (doc_id == seed_doc_id) + message = seed_message; + +- _thread_add_message (thread, message, exclude_terms); ++ _thread_add_message (thread, message, exclude_terms, omit_excluded); + + if ( _notmuch_doc_id_set_contains (match_set, doc_id)) { + _notmuch_doc_id_set_remove (match_set, doc_id); +-- +1.7.9.1 + -- 2.26.2