X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=query.cc;h=c8a9149118b7793bfff7e2525a37e8bf4f29bdb0;hp=88d76ef19ff6c2b825d81bbb256e218607c6f839;hb=94f01d9de914b609e1f02385092b82fd61ca73b5;hpb=7b227a6bf7eb409b4353adc430b2545166e0c4cd

diff --git a/query.cc b/query.cc
index 88d76ef1..c8a91491 100644
--- a/query.cc
+++ b/query.cc
@@ -21,6 +21,8 @@
 #include "notmuch-private.h"
 #include "database-private.h"
 
+#include <glib.h> /* GHashTable, GPtrArray */
+
 #include <xapian.h>
 
 struct _notmuch_query {
@@ -29,12 +31,18 @@ struct _notmuch_query {
     notmuch_sort_t sort;
 };
 
-struct _notmuch_results {
+struct _notmuch_message_results {
     notmuch_database_t *notmuch;
     Xapian::MSetIterator iterator;
     Xapian::MSetIterator iterator_end;
 };
 
+struct _notmuch_thread_results {
+    notmuch_database_t *notmuch;
+    GPtrArray *threads;
+    unsigned int index;
+};
+
 notmuch_query_t *
 notmuch_query_create (notmuch_database_t *notmuch,
 		      const char *query_string)
@@ -71,7 +79,7 @@ notmuch_query_set_sort (notmuch_query_t *query, notmuch_sort_t sort)
  * talloc_set_destructor at all otherwise).
  */
 static int
-_notmuch_results_destructor (notmuch_results_t *results)
+_notmuch_message_results_destructor (notmuch_message_results_t *results)
 {
     results->iterator.~MSetIterator ();
     results->iterator_end.~MSetIterator ();
@@ -79,14 +87,14 @@ _notmuch_results_destructor (notmuch_results_t *results)
     return 0;
 }
 
-notmuch_results_t *
-notmuch_query_search (notmuch_query_t *query)
+notmuch_message_results_t *
+notmuch_query_search_messages (notmuch_query_t *query)
 {
     notmuch_database_t *notmuch = query->notmuch;
     const char *query_string = query->query_string;
-    notmuch_results_t *results;
+    notmuch_message_results_t *results;
 
-    results = talloc (query, notmuch_results_t);
+    results = talloc (query, notmuch_message_results_t);
     if (unlikely (results == NULL))
 	return NULL;
 
@@ -137,7 +145,7 @@ notmuch_query_search (notmuch_query_t *query)
 	new (&results->iterator) Xapian::MSetIterator ();
 	new (&results->iterator_end) Xapian::MSetIterator ();
 
-	talloc_set_destructor (results, _notmuch_results_destructor);
+	talloc_set_destructor (results, _notmuch_message_results_destructor);
 
 	results->iterator = mset.begin ();
 	results->iterator_end = mset.end ();
@@ -150,6 +158,77 @@ notmuch_query_search (notmuch_query_t *query)
     return results;
 }
 
+/* Glib objects force use to use a talloc destructor as well, (but not
+ * nearly as ugly as the for message_results due to C++ objects). At
+ * this point, I'd really like to have some talloc-friendly
+ * equivalents for the few pieces of glib that I'm using. */
+static int
+_notmuch_thread_results_destructor (notmuch_thread_results_t *results)
+{
+    g_ptr_array_free (results->threads, TRUE);
+
+    return 0;
+}
+
+notmuch_thread_results_t *
+notmuch_query_search_threads (notmuch_query_t *query)
+{
+    notmuch_thread_results_t *thread_results;
+    notmuch_thread_t *thread;
+    const char *thread_id;
+    notmuch_message_results_t *message_results;
+    notmuch_message_t *message;
+    notmuch_tags_t *tags;
+    const char *tag;
+    GHashTable *seen;
+
+    thread_results = talloc (query, notmuch_thread_results_t);
+    if (thread_results == NULL)
+	return NULL;
+
+    thread_results->notmuch = query->notmuch;
+    thread_results->threads = g_ptr_array_new ();
+    thread_results->index = 0;
+
+    talloc_set_destructor (thread_results, _notmuch_thread_results_destructor);
+
+    seen = g_hash_table_new_full (g_str_hash, g_str_equal,
+				  free, NULL);
+
+    for (message_results = notmuch_query_search_messages (query);
+	 notmuch_message_results_has_more (message_results);
+	 notmuch_message_results_advance (message_results))
+    {
+	message = notmuch_message_results_get (message_results);
+
+	thread_id = notmuch_message_get_thread_id (message);
+
+	if (! g_hash_table_lookup_extended (seen,
+					    thread_id, NULL,
+					    (void **) &thread))
+	{
+	    thread = _notmuch_thread_create (query, query->notmuch,
+					     thread_id);
+
+	    g_hash_table_insert (seen, xstrdup (thread_id), thread);
+
+	    g_ptr_array_add (thread_results->threads, thread);
+	}
+
+	for (tags = notmuch_message_get_tags (message);
+	     notmuch_tags_has_more (tags);
+	     notmuch_tags_advance (tags))
+	{
+	    tag = notmuch_tags_get (tags);
+	    _notmuch_thread_add_tag (thread, tag);
+	}
+    }
+
+    g_hash_table_unref (seen);
+
+    return thread_results;
+}
+
 void
 notmuch_query_destroy (notmuch_query_t *query)
 {
@@ -157,18 +236,21 @@ notmuch_query_destroy (notmuch_query_t *query)
 }
 
 notmuch_bool_t
-notmuch_results_has_more (notmuch_results_t *results)
+notmuch_message_results_has_more (notmuch_message_results_t *results)
 {
     return (results->iterator != results->iterator_end);
 }
 
 notmuch_message_t *
-notmuch_results_get (notmuch_results_t *results)
+notmuch_message_results_get (notmuch_message_results_t *results)
 {
     notmuch_message_t *message;
     Xapian::docid doc_id;
     notmuch_private_status_t status;
 
+    if (! notmuch_message_results_has_more (results))
+	return NULL;
+
     doc_id = *results->iterator;
 
     message = _notmuch_message_create (results,
@@ -185,13 +267,41 @@ notmuch_results_get (notmuch_results_t *results)
 }
 
 void
-notmuch_results_advance (notmuch_results_t *results)
+notmuch_message_results_advance (notmuch_message_results_t *results)
 {
     results->iterator++;
 }
 
 void
-notmuch_results_destroy (notmuch_results_t *results)
+notmuch_message_results_destroy (notmuch_message_results_t *results)
+{
+    talloc_free (results);
+}
+
+notmuch_bool_t
+notmuch_thread_results_has_more (notmuch_thread_results_t *results)
+{
+    return (results->index < results->threads->len);
+}
+
+notmuch_thread_t *
+notmuch_thread_results_get (notmuch_thread_results_t *results)
+{
+    if (! notmuch_thread_results_has_more (results))
+	return NULL;
+
+    return (notmuch_thread_t *) g_ptr_array_index (results->threads,
+						   results->index);
+}
+
+void
+notmuch_thread_results_advance (notmuch_thread_results_t *results)
+{
+    results->index++;
+}
+
+void
+notmuch_thread_results_destroy (notmuch_thread_results_t *results)
 {
     talloc_free (results);
 }