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 5D0DB431FB6 for ; Sun, 17 Jun 2012 00:27:49 -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 tRfMWJ6rQTAQ for ; Sun, 17 Jun 2012 00:27:48 -0700 (PDT) Received: from mail-wi0-f173.google.com (mail-wi0-f173.google.com [209.85.212.173]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id 0AEFD431FAE for ; Sun, 17 Jun 2012 00:27:47 -0700 (PDT) Received: by wibhj6 with SMTP id hj6so672804wib.2 for ; Sun, 17 Jun 2012 00:27:46 -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=GFImdg3Uo0rxjluXp4e7/UoPoP8xfWiN9AlZGQfP8mU=; b=003X5o5n8oF/EFiHOAN5i8oHBo1g31tLZEE4LHizfGI9oqMC09FmyjTB5/KKI9pL3S js8dsIPnsacrkJDzHvH1EUAMDQnMIlEV8zl5Z2drX2OuIJb3AJDPouL8z1driE4aWv4Z Iuj2Dg1Zj7W4ipSCTEm7aYsFsVwUsVO0VceHRq2eQVDqYSS607oLWzlVM1qtqjQhgs1+ zU866v3y6APCJ0pHweCaotqoaQ8VI3H90RNxTbwH9m2ErwvOgjcnVFUs17bdSlB2/IZb FJRCHw1WCoGSm4bZj3NIcKju/vn4uII0s+TzZGstgpQ7BkmaSTZ6Utu3mKl0Feh0B2hU lmCg== Received: by 10.216.209.95 with SMTP id r73mr6462539weo.157.1339918066272; Sun, 17 Jun 2012 00:27:46 -0700 (PDT) Received: from localhost (94-192-233-223.zone6.bethere.co.uk. [94.192.233.223]) by mx.google.com with ESMTPS id f7sm28394936wiv.2.2012.06.17.00.27.44 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 17 Jun 2012 00:27:45 -0700 (PDT) From: Mark Walters To: notmuch@notmuchmail.org, novalazy@gmail.com Subject: [WIP 1/2] lib: add --exclude=all option Date: Sun, 17 Jun 2012 08:27:25 +0100 Message-Id: <1339918046-3448-1-git-send-email-markwalters1009@gmail.com> X-Mailer: git-send-email 1.7.9.1 In-Reply-To: <87zk82l7wp.fsf@qmul.ac.uk> References: <87zk82l7wp.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: Sun, 17 Jun 2012 07:27:49 -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 | 3 ++- lib/notmuch.h | 10 +++++++++- lib/query.cc | 11 ++++++----- lib/thread.cc | 41 +++++++++++++++++++++++++++++------------ 4 files changed, 46 insertions(+), 19 deletions(-) diff --git a/lib/notmuch-private.h b/lib/notmuch-private.h index bfb4111..3b92ac2 100644 --- a/lib/notmuch-private.h +++ b/lib/notmuch-private.h @@ -232,7 +232,8 @@ _notmuch_thread_create (void *ctx, unsigned int seed_doc_id, notmuch_doc_id_set_t *match_set, notmuch_string_list_t *excluded_terms, - notmuch_sort_t sort); + notmuch_sort_t sort, + notmuch_exclude_t omit_exclude); /* message.cc */ diff --git a/lib/notmuch.h b/lib/notmuch.h index 3633bed..57cc700 100644 --- a/lib/notmuch.h +++ b/lib/notmuch.h @@ -500,6 +500,14 @@ 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. * @@ -518,7 +526,7 @@ 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); /* Specify the sorting desired for this query. */ void diff --git a/lib/query.cc b/lib/query.cc index e9c1a2d..fea76f8 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,7 @@ 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 +220,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,7 +486,8 @@ notmuch_threads_get (notmuch_threads_t *threads) doc_id, &threads->match_set, threads->query->exclude_terms, - threads->query->sort); + threads->query->sort, + threads->query->omit_excluded); } void diff --git a/lib/thread.cc b/lib/thread.cc index e976d64..6b52792 100644 --- a/lib/thread.cc +++ b/lib/thread.cc @@ -215,7 +215,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; @@ -223,6 +224,26 @@ _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; + 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)); @@ -263,17 +284,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 @@ -404,7 +420,8 @@ _notmuch_thread_create (void *ctx, unsigned int seed_doc_id, notmuch_doc_id_set_t *match_set, notmuch_string_list_t *exclude_terms, - notmuch_sort_t sort) + notmuch_sort_t sort, + notmuch_exclude_t omit_excluded) { notmuch_thread_t *thread; notmuch_message_t *seed_message; @@ -479,7 +496,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