--- /dev/null
+Return-Path: <m.walters@qmul.ac.uk>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by olra.theworths.org (Postfix) with ESMTP id 8CDD0431E64\r
+ for <notmuch@notmuchmail.org>; Tue, 31 Jan 2012 03:46:32 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -1.098\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-1.098 tagged_above=-999 required=5\r
+ tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001,\r
+ NML_ADSP_CUSTOM_MED=1.2, RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+ by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id a-39DRcVJUfz for <notmuch@notmuchmail.org>;\r
+ Tue, 31 Jan 2012 03:46:31 -0800 (PST)\r
+Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6])\r
+ (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id 92122429E34\r
+ for <notmuch@notmuchmail.org>; Tue, 31 Jan 2012 03:46:31 -0800 (PST)\r
+Received: from smtp.qmul.ac.uk ([138.37.6.40])\r
+ by mail2.qmul.ac.uk with esmtp (Exim 4.71)\r
+ (envelope-from <m.walters@qmul.ac.uk>)\r
+ id 1RsCAP-0004sm-OF; Tue, 31 Jan 2012 11:46:30 +0000\r
+Received: from 94-192-233-223.zone6.bethere.co.uk ([94.192.233.223]\r
+ helo=localhost)\r
+ by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.69)\r
+ (envelope-from <m.walters@qmul.ac.uk>)\r
+ id 1RsCAP-0006pT-Bo; Tue, 31 Jan 2012 11:46:29 +0000\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: Austin Clements <amdragon@MIT.EDU>\r
+Subject: Re: [PATCH 4/7] lib: Add the exclude flag to\r
+ notmuch_query_search_threads\r
+In-Reply-To: <20120131045020.GA17991@mit.edu>\r
+References: <8762fu4aqt.fsf@qmul.ac.uk>\r
+ <1327862394-14334-4-git-send-email-markwalters1009@gmail.com>\r
+ <20120131045020.GA17991@mit.edu>\r
+User-Agent: Notmuch/0.11+137~g98adc3d (http://notmuchmail.org) Emacs/23.2.1\r
+ (i486-pc-linux-gnu)\r
+Date: Tue, 31 Jan 2012 11:47:35 +0000\r
+Message-ID: <87vcnsccvc.fsf@qmul.ac.uk>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Sender-Host-Address: 94.192.233.223\r
+X-QM-SPAM-Info: Sender has good ham record. :)\r
+X-QM-Body-MD5: a02fe2a1a8b3d601adbe665bd043bd79 (of first 20000 bytes)\r
+X-SpamAssassin-Score: -1.8\r
+X-SpamAssassin-SpamBar: -\r
+X-SpamAssassin-Report: The QM spam filters have analysed this message to\r
+ determine if it is\r
+ spam. We require at least 5.0 points to mark a message as spam.\r
+ This message scored -1.8 points.\r
+ Summary of the scoring: \r
+ * -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/,\r
+ * medium trust\r
+ * [138.37.6.40 listed in list.dnswl.org]\r
+ * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail\r
+ provider * (markwalters1009[at]gmail.com)\r
+ * -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay\r
+ * domain\r
+ * 0.5 AWL AWL: From: address is in the auto white-list\r
+X-QM-Scan-Virus: ClamAV says the message is clean\r
+Cc: notmuch@notmuchmail.org\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Tue, 31 Jan 2012 11:46:32 -0000\r
+\r
+On Mon, 30 Jan 2012 23:50:20 -0500, Austin Clements <amdragon@MIT.EDU> wrote:\r
+> Quoth Mark Walters on Jan 29 at 6:39 pm:\r
+> > Add the NOTMUCH_MESSAGE_FLAG_EXCLUDED flag to\r
+> > notmuch_query_search_threads. Implemented by inspecting the tags\r
+> > directly in _notmuch_thread_create/_thread_add_message rather than as\r
+> > a Xapian query for speed reasons.\r
+> > ---\r
+> > lib/notmuch-private.h | 16 ++++++++++------\r
+> > lib/query.cc | 1 +\r
+> > lib/thread.cc | 18 +++++++++++++++---\r
+> > 3 files changed, 26 insertions(+), 9 deletions(-)\r
+> > \r
+> > diff --git a/lib/notmuch-private.h b/lib/notmuch-private.h\r
+> > index e791bb0..56b87c6 100644\r
+> > --- a/lib/notmuch-private.h\r
+> > +++ b/lib/notmuch-private.h\r
+> > @@ -211,12 +211,8 @@ _notmuch_directory_get_document_id (notmuch_directory_t *directory);\r
+> > \r
+> > /* thread.cc */\r
+> > \r
+> > -notmuch_thread_t *\r
+> > -_notmuch_thread_create (void *ctx,\r
+> > - notmuch_database_t *notmuch,\r
+> > - unsigned int seed_doc_id,\r
+> > - notmuch_doc_id_set_t *match_set,\r
+> > - notmuch_sort_t sort);\r
+> > +/* Definition of _notmuch_thread_create moved later since now uses\r
+> > + * string_list_t */\r
+> \r
+> Naw, leave the definition here along with the other things from\r
+> thread.cc and just add a\r
+> \r
+> typedef struct _notmuch_string_list notmuch_string_list_t;\r
+> \r
+> along with the typedef for notmuch_doc_id_set_t near the top. (You\r
+> might also have to tweak the typedef of notmuch_string_list_t later so\r
+> it's just the struct definition.)\r
+\r
+Will do.\r
+\r
+> > /* message.cc */\r
+> > \r
+> > @@ -492,6 +488,14 @@ notmuch_filenames_t *\r
+> > _notmuch_filenames_create (const void *ctx,\r
+> > notmuch_string_list_t *list);\r
+> > \r
+> > +notmuch_thread_t *\r
+> > +_notmuch_thread_create (void *ctx,\r
+> > + notmuch_database_t *notmuch,\r
+> > + unsigned int seed_doc_id,\r
+> > + notmuch_doc_id_set_t *match_set,\r
+> > + notmuch_string_list_t *excluded_terms,\r
+> > + notmuch_sort_t sort);\r
+> > +\r
+> > #pragma GCC visibility pop\r
+> > \r
+> > NOTMUCH_END_DECLS\r
+> > diff --git a/lib/query.cc b/lib/query.cc\r
+> > index 7d165d2..dee7ec0 100644\r
+> > --- a/lib/query.cc\r
+> > +++ b/lib/query.cc\r
+> > @@ -472,6 +472,7 @@ notmuch_threads_get (notmuch_threads_t *threads)\r
+> > threads->query->notmuch,\r
+> > doc_id,\r
+> > &threads->match_set,\r
+> > + threads->query->exclude_terms,\r
+> > threads->query->sort);\r
+> > }\r
+> > \r
+> > diff --git a/lib/thread.cc b/lib/thread.cc\r
+> > index 0435ee6..6d65d52 100644\r
+> > --- a/lib/thread.cc\r
+> > +++ b/lib/thread.cc\r
+> > @@ -214,7 +214,8 @@ _thread_cleanup_author (notmuch_thread_t *thread,\r
+> > */\r
+> > static void\r
+> > _thread_add_message (notmuch_thread_t *thread,\r
+> > - notmuch_message_t *message)\r
+> > + notmuch_message_t *message,\r
+> > + notmuch_string_list_t *exclude_terms)\r
+> > {\r
+> > notmuch_tags_t *tags;\r
+> > const char *tag;\r
+> > @@ -262,6 +263,15 @@ _thread_add_message (notmuch_thread_t *thread,\r
+> > notmuch_tags_move_to_next (tags))\r
+> > {\r
+> > tag = notmuch_tags_get (tags);\r
+> > + /* mark excluded messages */\r
+> \r
+> Capital and period.\r
+\r
+Will fix.\r
+\r
+> > + for (notmuch_string_node_t *term = exclude_terms->head; term;\r
+> > + term = term->next) {\r
+> > + /* we ignore initial 'K' */\r
+> \r
+> Same.\r
+\r
+Will fix\r
+\r
+> > + if (strcmp(tag, (term->string + 1)) == 0) {\r
+> > + notmuch_message_set_flag (message, NOTMUCH_MESSAGE_FLAG_EXCLUDED, TRUE);\r
+> > + break;\r
+> > + }\r
+> > + }\r
+> > g_hash_table_insert (thread->tags, xstrdup (tag), NULL);\r
+> > }\r
+> > }\r
+> > @@ -321,7 +331,8 @@ _thread_add_matched_message (notmuch_thread_t *thread,\r
+> > _thread_set_subject_from_message (thread, message);\r
+> > }\r
+> > \r
+> > - thread->matched_messages++;\r
+> > + if (!notmuch_message_get_flag (message, NOTMUCH_MESSAGE_FLAG_EXCLUDED))\r
+> > + thread->matched_messages++;\r
+> \r
+> I'd still say this warrants a better API.\r
+\r
+I agree: I will think about that.\r
+\r
+> > if (g_hash_table_lookup_extended (thread->message_hash,\r
+> > notmuch_message_get_message_id (message), NULL,\r
+> > @@ -392,6 +403,7 @@ _notmuch_thread_create (void *ctx,\r
+> > notmuch_database_t *notmuch,\r
+> > unsigned int seed_doc_id,\r
+> > notmuch_doc_id_set_t *match_set,\r
+> > + notmuch_string_list_t *exclude_terms,\r
+> > notmuch_sort_t sort)\r
+> > {\r
+> > notmuch_thread_t *thread;\r
+> > @@ -467,7 +479,7 @@ _notmuch_thread_create (void *ctx,\r
+> > if (doc_id == seed_doc_id)\r
+> > message = seed_message;\r
+> > \r
+> > - _thread_add_message (thread, message);\r
+> > + _thread_add_message (thread, message, exclude_terms);\r
+> > \r
+> > if ( _notmuch_doc_id_set_contains (match_set, doc_id)) {\r
+> > _notmuch_doc_id_set_remove (match_set, doc_id);\r
projects / notmuch-archives.git / commitdiff