notmuch search: Avoid printing duplicate author names.

[notmuch] / lib / thread.cc

diff --git a/lib/thread.cc b/lib/thread.cc
index b67dfade5e16091fde964ddbafd69e1da6b5eb01..4f0696b4fc01b8ee13b3fc1af49e3ac03b0bdcb1 100644 (file)
--- a/lib/thread.cc
+++ b/lib/thread.cc
@@ -23,12 +23,15 @@
 
 #include <xapian.h>
 
+#include <gmime/gmime.h>
 #include <glib.h> /* GHashTable */
 
 struct _notmuch_thread {
     notmuch_database_t *notmuch;
     char *thread_id;
     char *subject;
+    GHashTable *authors_hash;
+    char *authors;
     GHashTable *tags;
 
     notmuch_bool_t has_message;
@@ -39,13 +42,90 @@ 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.
+static void
+_thread_add_author (notmuch_thread_t *thread,
+                   const char *author)
+{
+    if (author == NULL)
+       return;
+
+    if (g_hash_table_lookup_extended (thread->authors_hash,
+                                     author, NULL, NULL))
+       return;
+
+    g_hash_table_insert (thread->authors_hash, xstrdup (author), NULL);
+
+    if (thread->authors)
+       thread->authors = talloc_asprintf (thread, "%s, %s",
+                                          thread->authors,
+                                          author);
+    else
+       thread->authors = talloc_strdup (thread, author);
+}
+
+static void
+_thread_add_message (notmuch_thread_t *thread,
+                    notmuch_message_t *message)
+{
+    notmuch_tags_t *tags;
+    const char *tag;
+    time_t date;
+    InternetAddressList *list;
+    InternetAddress *address;
+    const char *from, *author;
+
+    from = notmuch_message_get_header (message, "from");
+    list = internet_address_list_parse_string (from);
+    if (list) {
+       address = internet_address_list_get_address (list, 0);
+       if (address) {
+           author = internet_address_get_name (address);
+           if (author == NULL) {
+               InternetAddressMailbox *mailbox;
+               mailbox = INTERNET_ADDRESS_MAILBOX (address);
+               author = internet_address_mailbox_get_addr (mailbox);
+           }
+           _thread_add_author (thread, author);
+       }
+       g_object_unref (G_OBJECT (list));
+    }
+
+    if (! thread->subject) {
+       const char *subject;
+       subject = notmuch_message_get_header (message, "subject");
+       thread->subject = talloc_strdup (thread, subject);
+    }
+
+    for (tags = notmuch_message_get_tags (message);
+        notmuch_tags_has_more (tags);
+        notmuch_tags_advance (tags))
+    {
+       tag = notmuch_tags_get (tags);
+       g_hash_table_insert (thread->tags, xstrdup (tag), NULL);
+    }
+
+    date = notmuch_message_get_date (message);
+
+    if (date < thread->oldest || ! thread->has_message)
+       thread->oldest = date;
+
+    if (date > thread->newest || ! thread->has_message)
+       thread->newest = date;
+
+    thread->has_message = 1;
+}
+
+/* Create a new notmuch_thread_t object for the given thread ID.
+ *
+ * Creating the thread will trigger a database search for the messages
+ * belonging to the thread so that the thread object can return some
+ * details about them, (authors, subject, etc.).
  *
  * Here, 'talloc owner' is an optional talloc context to which the new
  * thread will belong. This allows for the caller to not bother
@@ -60,13 +140,24 @@ _notmuch_thread_destructor (notmuch_thread_t *thread)
  * This function returns NULL in the case of any error.
  */
 notmuch_thread_t *
-_notmuch_thread_create (const void *talloc_owner,
+_notmuch_thread_create (const void *ctx,
                        notmuch_database_t *notmuch,
                        const char *thread_id)
 {
     notmuch_thread_t *thread;
+    const char *query_string;
+    notmuch_query_t *query;
+    notmuch_messages_t *messages;
 
-    thread = talloc (talloc_owner, notmuch_thread_t);
+    query_string = talloc_asprintf (ctx, "thread:%s", thread_id);
+    if (unlikely (query_string == NULL))
+       return NULL;
+
+    query = notmuch_query_create (notmuch, query_string);
+    if (unlikely (query == NULL))
+       return NULL;
+
+    thread = talloc (ctx, notmuch_thread_t);
     if (unlikely (thread == NULL))
        return NULL;
 
@@ -75,6 +166,9 @@ _notmuch_thread_create (const void *talloc_owner,
     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);
 
@@ -82,6 +176,17 @@ _notmuch_thread_create (const void *talloc_owner,
     thread->oldest = 0;
     thread->newest = 0;
 
+    notmuch_query_set_sort (query, NOTMUCH_SORT_DATE_OLDEST_FIRST);
+
+    for (messages = notmuch_query_search_messages (query, 0, -1);
+        notmuch_messages_has_more (messages);
+        notmuch_messages_advance (messages))
+    {
+       _thread_add_message (thread, notmuch_messages_get (messages));
+    }
+
+    notmuch_query_destroy (query);
+
     return thread;
 }
 
@@ -91,37 +196,10 @@ notmuch_thread_get_thread_id (notmuch_thread_t *thread)
     return thread->thread_id;
 }
 
-void
-_notmuch_thread_add_message (notmuch_thread_t *thread,
-                            notmuch_message_t *message)
+const char *
+notmuch_thread_get_authors (notmuch_thread_t *thread)
 {
-    notmuch_tags_t *tags;
-    const char *tag;
-    time_t date;
-
-    if (! thread->subject) {
-       const char *subject;
-       subject = notmuch_message_get_header (message, "subject");
-       thread->subject = talloc_strdup (thread, subject);
-    }
-
-    for (tags = notmuch_message_get_tags (message);
-        notmuch_tags_has_more (tags);
-        notmuch_tags_advance (tags))
-    {
-       tag = notmuch_tags_get (tags);
-       g_hash_table_insert (thread->tags, xstrdup (tag), NULL);
-    }
-
-    date = notmuch_message_get_date (message);
-
-    if (date < thread->oldest || ! thread->has_message)
-       thread->oldest = date;
-
-    if (date > thread->newest || ! thread->has_message)
-       thread->newest = date;
-
-    thread->has_message = 1;
+    return thread->authors;
 }
 
 const char *