X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=lib%2Fthread.cc;h=9b37143d33a4b14aabd62ed20c13183d506ba714;hp=e38a5b2e0abc336bd16fe03de8cb82902abd984d;hb=36e4459a328b8449b3e9d510be81a332a9b35aaa;hpb=387828c4356416278fdac8446c904fe4c5ad283d diff --git a/lib/thread.cc b/lib/thread.cc index e38a5b2e..9b37143d 100644 --- a/lib/thread.cc +++ b/lib/thread.cc @@ -112,15 +112,9 @@ _thread_add_message (notmuch_thread_t *thread, 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)) + notmuch_tags_valid (tags); + notmuch_tags_move_to_next (tags)) { tag = notmuch_tags_get (tags); g_hash_table_insert (thread->tags, xstrdup (tag), NULL); @@ -129,9 +123,11 @@ _thread_add_message (notmuch_thread_t *thread, static void _thread_add_matched_message (notmuch_thread_t *thread, - notmuch_message_t *message) + notmuch_message_t *message, + notmuch_sort_t sort) { time_t date; + notmuch_message_t *hashed_message; date = notmuch_message_get_date (message); @@ -141,7 +137,32 @@ _thread_add_matched_message (notmuch_thread_t *thread, if (date > thread->newest || ! thread->matched_messages) thread->newest = date; + if (! thread->subject) { + const char *subject; + + subject = notmuch_message_get_header (message, "subject"); + + if ((strncasecmp (subject, "Re: ", 4) == 0) || + (strncasecmp (subject, "Aw: ", 4) == 0) || + (strncasecmp (subject, "Vs: ", 4) == 0) || + (strncasecmp (subject, "Sv: ", 4) == 0)) + { + thread->subject = talloc_strdup (thread, subject + 4); + } + else + { + thread->subject = talloc_strdup (thread, subject); + } + } + thread->matched_messages++; + + if (g_hash_table_lookup_extended (thread->message_hash, + notmuch_message_get_message_id (message), NULL, + (void **) &hashed_message)) { + notmuch_message_set_flag (hashed_message, + NOTMUCH_MESSAGE_FLAG_MATCH, 1); + } } static void @@ -190,7 +211,7 @@ _resolve_thread_relationships (unused (notmuch_thread_t *thread)) * 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 + * count of matched messages, and to allow a viewer to display these * messages differently. * * Here, 'ctx' is talloc context for the resulting thread object. @@ -201,35 +222,56 @@ notmuch_thread_t * _notmuch_thread_create (void *ctx, notmuch_database_t *notmuch, const char *thread_id, - const char *query_string) + const char *query_string, + notmuch_sort_t sort) { notmuch_thread_t *thread; - const char *thread_id_query_string, *matched_query_string; - notmuch_query_t *thread_id_query, *matched_query; + const char *thread_id_query_string; + notmuch_query_t *thread_id_query; + notmuch_messages_t *messages; + notmuch_message_t *message; + notmuch_bool_t matched_is_subset_of_thread; thread_id_query_string = talloc_asprintf (ctx, "thread:%s", thread_id); if (unlikely (query_string == NULL)) return NULL; - /* XXX: We could be a bit more efficient here if - * thread_id_query_string is identical to query_string, (then we - * could get by with just one database search instead of two). */ - - matched_query_string = talloc_asprintf (ctx, "%s AND (%s)", - thread_id_query_string, - query_string); - if (unlikely (matched_query_string == NULL)) - return NULL; + /* Under normal circumstances we need to do two database + * queries. One is for the thread itself (thread_id_query_string) + * and the second is to determine which messages in that thread + * match the original query (matched_query_string). + * + * But under two circumstances, we use only the + * thread_id_query_string: + * + * 1. If the original query_string *is* just the thread + * specification. + * + * 2. If the original query_string matches all messages ("" or + * "*"). + * + * In either of these cases, we can be more efficient by running + * just the thread_id query (since we know all messages in the + * thread will match the query_string). + * + * Beyond the performance advantage, in the second case, it's + * important to not try to create a concatenated query because our + * parser handles "" and "*" as special cases and will not do the + * right thing with a query string of "* and thread:". + **/ + matched_is_subset_of_thread = 1; + if (strcmp (query_string, thread_id_query_string) == 0 || + strcmp (query_string, "") == 0 || + strcmp (query_string, "*") == 0) + { + matched_is_subset_of_thread = 0; + } 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; @@ -257,25 +299,50 @@ _notmuch_thread_create (void *ctx, thread->oldest = 0; thread->newest = 0; - notmuch_query_set_sort (thread_id_query, NOTMUCH_SORT_DATE); + notmuch_query_set_sort (thread_id_query, NOTMUCH_SORT_OLDEST_FIRST); - for (messages = notmuch_query_search_messages (thread_id_query, 0, -1); - notmuch_messages_has_more (messages); - notmuch_messages_advance (messages)) + for (messages = notmuch_query_search_messages (thread_id_query); + notmuch_messages_valid (messages); + notmuch_messages_move_to_next (messages)) { - _thread_add_message (thread, notmuch_messages_get (messages)); + message = notmuch_messages_get (messages); + + _thread_add_message (thread, message); + + if (! matched_is_subset_of_thread) + _thread_add_matched_message (thread, message, sort); + + _notmuch_message_close (message); } 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)) + if (matched_is_subset_of_thread) { - _thread_add_matched_message (thread, notmuch_messages_get (messages)); - } + const char *matched_query_string; + notmuch_query_t *matched_query; + + matched_query_string = talloc_asprintf (ctx, "%s AND (%s)", + thread_id_query_string, + query_string); + if (unlikely (matched_query_string == NULL)) + return NULL; + + matched_query = notmuch_query_create (notmuch, matched_query_string); + if (unlikely (matched_query == NULL)) + return NULL; + + for (messages = notmuch_query_search_messages (matched_query); + notmuch_messages_valid (messages); + notmuch_messages_move_to_next (messages)) + { + message = notmuch_messages_get (messages); + _thread_add_matched_message (thread, message, sort); + _notmuch_message_close (message); + } - notmuch_query_destroy (matched_query); + notmuch_query_destroy (matched_query); + } _resolve_thread_relationships (thread);