thread: Fix sort of search when constructing threads.

[notmuch] / lib / thread.cc

diff --git a/lib/thread.cc b/lib/thread.cc
index 3aa9d4807292f873970780092dd7741f2c6bedee..1b6feab21626430a0f2247314372fba70612a653 100644 (file)
--- a/lib/thread.cc
+++ b/lib/thread.cc
@@ -112,12 +112,6 @@ _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_valid (tags);
         notmuch_tags_move_to_next (tags))
@@ -129,7 +123,8 @@ _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;
@@ -142,6 +137,24 @@ _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,
@@ -209,7 +222,8 @@ 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;
@@ -285,7 +299,7 @@ _notmuch_thread_create (void *ctx,
     thread->oldest = 0;
     thread->newest = 0;
 
-    notmuch_query_set_sort (thread_id_query, NOTMUCH_SORT_OLDEST_FIRST);
+    notmuch_query_set_sort (thread_id_query, sort);
 
     for (messages = notmuch_query_search_messages (thread_id_query);
         notmuch_messages_valid (messages);
@@ -296,7 +310,7 @@ _notmuch_thread_create (void *ctx,
        _thread_add_message (thread, message);
 
        if (! matched_is_subset_of_thread)
-           _thread_add_matched_message (thread, message);
+           _thread_add_matched_message (thread, message, sort);
 
        _notmuch_message_close (message);
     }
@@ -318,12 +332,14 @@ _notmuch_thread_create (void *ctx,
        if (unlikely (matched_query == NULL))
            return NULL;
 
+       notmuch_query_set_sort (matched_query, sort);
+
        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);
+           _thread_add_matched_message (thread, message, sort);
            _notmuch_message_close (message);
        }