X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=lib%2Fthread.cc;h=df1d0db7fae0ac0f4e8d8f6c400d31dc09b2b3b6;hp=e85e2afdb19e3526615ec813fe2720bbb16a2726;hb=c168e24174d32563ceb1a35d9bf1875c5bfeac25;hpb=2f4c5874747c58be04764a7c9a62f3b352e4f9fb

diff --git a/lib/thread.cc b/lib/thread.cc
index e85e2afd..df1d0db7 100644
--- a/lib/thread.cc
+++ b/lib/thread.cc
@@ -30,10 +30,12 @@ struct _notmuch_thread {
     notmuch_database_t *notmuch;
     char *thread_id;
     char *subject;
+    GHashTable *authors_hash;
     char *authors;
     GHashTable *tags;
 
-    notmuch_bool_t has_message;
+    int total_messages;
+    int matched_messages;
     time_t oldest;
     time_t newest;
 };
@@ -41,62 +43,36 @@ struct _notmuch_thread {
 static int
 _notmuch_thread_destructor (notmuch_thread_t *thread)
 {
+    g_hash_table_unref (thread->authors_hash);
     g_hash_table_unref (thread->tags);
 
     return 0;
 }
 
-/* Create a new notmuch_thread_t object for an existing document in
- * the database.
- *
- * Here, 'talloc owner' is an optional talloc context to which the new
- * thread will belong. This allows for the caller to not bother
- * calling notmuch_thread_destroy on the thread, and know that all
- * memory will be reclaimed with 'talloc_owner' is freed. The caller
- * still can call notmuch_thread_destroy when finished with the
- * thread if desired.
- *
- * The 'talloc_owner' argument can also be NULL, in which case the
- * caller *is* responsible for calling notmuch_thread_destroy.
- *
- * This function returns NULL in the case of any error.
- */
-notmuch_thread_t *
-_notmuch_thread_create (const void *talloc_owner,
-			notmuch_database_t *notmuch,
-			const char *thread_id)
+static void
+_thread_add_author (notmuch_thread_t *thread,
+		    const char *author)
 {
-    notmuch_thread_t *thread;
-
-    thread = talloc (talloc_owner, notmuch_thread_t);
-    if (unlikely (thread == NULL))
-	return NULL;
+    if (author == NULL)
+	return;
 
-    talloc_set_destructor (thread, _notmuch_thread_destructor);
-
-    thread->notmuch = notmuch;
-    thread->thread_id = talloc_strdup (thread, thread_id);
-    thread->subject = NULL;
-    thread->authors = NULL;
-    thread->tags = g_hash_table_new_full (g_str_hash, g_str_equal,
-					  free, NULL);
-
-    thread->has_message = 0;
-    thread->oldest = 0;
-    thread->newest = 0;
+    if (g_hash_table_lookup_extended (thread->authors_hash,
+				      author, NULL, NULL))
+	return;
 
-    return thread;
-}
+    g_hash_table_insert (thread->authors_hash, xstrdup (author), NULL);
 
-const char *
-notmuch_thread_get_thread_id (notmuch_thread_t *thread)
-{
-    return thread->thread_id;
+    if (thread->authors)
+	thread->authors = talloc_asprintf (thread, "%s, %s",
+					   thread->authors,
+					   author);
+    else
+	thread->authors = talloc_strdup (thread, author);
 }
 
-void
-_notmuch_thread_add_message (notmuch_thread_t *thread,
-			     notmuch_message_t *message)
+static void
+_thread_add_message (notmuch_thread_t *thread,
+		     notmuch_message_t *message)
 {
     notmuch_tags_t *tags;
     const char *tag;
@@ -116,14 +92,7 @@ _notmuch_thread_add_message (notmuch_thread_t *thread,
 		mailbox = INTERNET_ADDRESS_MAILBOX (address);
 		author = internet_address_mailbox_get_addr (mailbox);
 	    }
-	    if (author) {
-		if (thread->authors)
-		    thread->authors = talloc_asprintf (thread, "%s, %s",
-						       thread->authors,
-						       author);
-		else
-		    thread->authors = talloc_strdup (thread, author);
-	    }
+	    _thread_add_author (thread, author);
 	}
 	g_object_unref (G_OBJECT (list));
     }
@@ -144,13 +113,118 @@ _notmuch_thread_add_message (notmuch_thread_t *thread,
 
     date = notmuch_message_get_date (message);
 
-    if (date < thread->oldest || ! thread->has_message)
+    if (date < thread->oldest || ! thread->total_messages)
 	thread->oldest = date;
 
-    if (date > thread->newest || ! thread->has_message)
+    if (date > thread->newest || ! thread->total_messages)
 	thread->newest = date;
 
-    thread->has_message = 1;
+    thread->total_messages++;
+}
+
+/* Create a new notmuch_thread_t object for the given thread ID,
+ * treating any messages matching 'query_string' as "matched".
+ *
+ * Creating the thread will trigger two database searches. The first
+ * is for all messages belonging to the thread, (to get the first
+ * subject line, the total count of messages, and all authors). The
+ * second search is for all messages that are in the thread and that
+ * also match the given query_string. This is to allow for a separate
+ * count of matched messages, and to allow a viewer to diplay these
+ * messages differently.
+ *
+ * Here, 'ctx' is talloc context for the resulting thread object.
+ *
+ * This function returns NULL in the case of any error.
+ */
+notmuch_thread_t *
+_notmuch_thread_create (void *ctx,
+			notmuch_database_t *notmuch,
+			const char *thread_id,
+			const char *query_string)
+{
+    notmuch_thread_t *thread;
+    const char *thread_id_query_string, *matched_query_string;
+    notmuch_query_t *thread_id_query, *matched_query;
+    notmuch_messages_t *messages;
+
+    thread_id_query_string = talloc_asprintf (ctx, "thread:%s", thread_id);
+    if (unlikely (query_string == NULL))
+	return NULL;
+
+    matched_query_string = talloc_asprintf (ctx, "%s AND (%s)",
+					    thread_id_query_string,
+					    query_string);
+    if (unlikely (matched_query_string == NULL))
+	return NULL;
+
+    thread_id_query = notmuch_query_create (notmuch, thread_id_query_string);
+    if (unlikely (thread_id_query == NULL))
+	return NULL;
+
+    matched_query = notmuch_query_create (notmuch, matched_query_string);
+    if (unlikely (thread_id_query == NULL))
+	return NULL;
+
+    thread = talloc (ctx, notmuch_thread_t);
+    if (unlikely (thread == NULL))
+	return NULL;
+
+    talloc_set_destructor (thread, _notmuch_thread_destructor);
+
+    thread->notmuch = notmuch;
+    thread->thread_id = talloc_strdup (thread, thread_id);
+    thread->subject = NULL;
+    thread->authors_hash = g_hash_table_new_full (g_str_hash, g_str_equal,
+						  free, NULL);
+    thread->authors = NULL;
+    thread->tags = g_hash_table_new_full (g_str_hash, g_str_equal,
+					  free, NULL);
+
+    thread->total_messages = 0;
+    thread->matched_messages = 0;
+    thread->oldest = 0;
+    thread->newest = 0;
+
+    notmuch_query_set_sort (thread_id_query, NOTMUCH_SORT_DATE_OLDEST_FIRST);
+
+    for (messages = notmuch_query_search_messages (thread_id_query, 0, -1);
+	 notmuch_messages_has_more (messages);
+	 notmuch_messages_advance (messages))
+    {
+	_thread_add_message (thread, notmuch_messages_get (messages));
+    }
+
+    notmuch_query_destroy (thread_id_query);
+
+    for (messages = notmuch_query_search_messages (matched_query, 0, -1);
+	 notmuch_messages_has_more (messages);
+	 notmuch_messages_advance (messages))
+    {
+	thread->matched_messages++;
+    }
+
+    notmuch_query_destroy (matched_query);
+
+    return thread;
+}
+
+const char *
+notmuch_thread_get_thread_id (notmuch_thread_t *thread)
+{
+    return thread->thread_id;
+}
+
+int
+notmuch_thread_get_total_messages (notmuch_thread_t *thread)
+{
+    return thread->total_messages;
+}
+
+int
+notmuch_thread_get_matched_messages (notmuch_thread_t *thread)
+{
+    return thread->matched_messages;
 }
 
 const char *