add From guessing tests to test suite

[notmuch] / lib / thread.cc

diff --git a/lib/thread.cc b/lib/thread.cc
index 1b6feab21626430a0f2247314372fba70612a653..5bf83540d6cf72a9abda4879a06f369f5399b78f 100644 (file)
--- a/lib/thread.cc
+++ b/lib/thread.cc
@@ -112,6 +112,12 @@ _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))
@@ -137,22 +143,26 @@ _thread_add_matched_message (notmuch_thread_t *thread,
     if (date > thread->newest || ! thread->matched_messages)
        thread->newest = date;
 
-    if (! thread->subject) {
-       const char *subject;
+    const char *subject;
+    const char *cleaned_subject;
 
-       subject = notmuch_message_get_header (message, "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);
-       }
+    if ((strncasecmp (subject, "Re: ", 4) == 0) ||
+       (strncasecmp (subject, "Aw: ", 4) == 0) ||
+       (strncasecmp (subject, "Vs: ", 4) == 0) ||
+       (strncasecmp (subject, "Sv: ", 4) == 0)) {
+
+       cleaned_subject = talloc_strndup (thread,
+                                         subject + 4,
+                                         strlen(subject) - 4);
+    } else {
+       cleaned_subject = talloc_strdup (thread, subject);
+    }
+
+    if ((sort == NOTMUCH_SORT_OLDEST_FIRST && date <= thread->newest) ||
+       (sort != NOTMUCH_SORT_OLDEST_FIRST && date == thread->newest)) {
+       thread->subject = talloc_strdup (thread, cleaned_subject);
     }
 
     thread->matched_messages++;
@@ -299,7 +309,7 @@ _notmuch_thread_create (void *ctx,
     thread->oldest = 0;
     thread->newest = 0;
 
-    notmuch_query_set_sort (thread_id_query, sort);
+    notmuch_query_set_sort (thread_id_query, NOTMUCH_SORT_OLDEST_FIRST);
 
     for (messages = notmuch_query_search_messages (thread_id_query);
         notmuch_messages_valid (messages);
@@ -332,8 +342,6 @@ _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))