X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=query.cc;h=5fac024e7a23be7f17d2d5eed4852b48445e27b4;hp=c153dad940bbae88587094287a594a3fe83464db;hb=f8a14b698fbdcd5a4748f3104d9c39e9f8015698;hpb=cd467cafb5eee180661ebc14e0fb71426e67c855

diff --git a/query.cc b/query.cc
index c153dad9..5fac024e 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 {
@@ -35,6 +37,12 @@ struct _notmuch_message_results {
     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)
@@ -150,6 +158,85 @@ notmuch_query_search_messages (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))
+	{
+	    const char *subject;
+
+	    thread = _notmuch_thread_create (query, query->notmuch,
+					     thread_id);
+
+	    subject = _notmuch_message_get_subject (message);
+
+	    _notmuch_thread_set_subject (thread, subject);
+
+	    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);
+	}
+
+	notmuch_message_destroy (message);
+    }
+
+    g_hash_table_unref (seen);
+
+    return thread_results;
+}
+
 void
 notmuch_query_destroy (notmuch_query_t *query)
 {
@@ -169,6 +256,9 @@ notmuch_message_results_get (notmuch_message_results_t *results)
     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,
@@ -195,3 +285,31 @@ 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);
+}