X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=lib%2Fthread.cc;h=df1d0db7fae0ac0f4e8d8f6c400d31dc09b2b3b6;hp=b67dfade5e16091fde964ddbafd69e1da6b5eb01;hb=c168e24174d32563ceb1a35d9bf1875c5bfeac25;hpb=146549321044615d9aef2b30cedccda9c49f3f38 diff --git a/lib/thread.cc b/lib/thread.cc index b67dfade..df1d0db7 100644 --- a/lib/thread.cc +++ b/lib/thread.cc @@ -23,15 +23,19 @@ #include +#include #include /* 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; + int total_messages; + int matched_messages; time_t oldest; time_t newest; }; @@ -39,34 +43,130 @@ 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->total_messages) + thread->oldest = date; + + if (date > thread->newest || ! thread->total_messages) + thread->newest = date; + + thread->total_messages++; +} + +/* Create a new notmuch_thread_t object for the given thread ID, + * treating any messages matching 'query_string' as "matched". * - * 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. + * 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. * - * The 'talloc_owner' argument can also be NULL, in which case the - * caller *is* responsible for calling notmuch_thread_destroy. + * 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 (const void *talloc_owner, +_notmuch_thread_create (void *ctx, notmuch_database_t *notmuch, - const char *thread_id) + 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; - thread = talloc (talloc_owner, notmuch_thread_t); + 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; @@ -75,13 +175,37 @@ _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); - thread->has_message = 0; + 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; } @@ -91,37 +215,22 @@ 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) +int +notmuch_thread_get_total_messages (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; + return thread->total_messages; +} - if (date > thread->newest || ! thread->has_message) - thread->newest = date; +int +notmuch_thread_get_matched_messages (notmuch_thread_t *thread) +{ + return thread->matched_messages; +} - thread->has_message = 1; +const char * +notmuch_thread_get_authors (notmuch_thread_t *thread) +{ + return thread->authors; } const char *