X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=lib%2Fthread.cc;h=1632da4cd0f4f9398e774b8157004e89914485d9;hp=8922403ea4b10c09d0982778245c69c583de7bf1;hb=6a9626a2fdddf6115bcf97982fd10053bf48e942;hpb=ce44657c9e4919b1e4bbbbbe37dbd72257d40736 diff --git a/lib/thread.cc b/lib/thread.cc index 8922403e..1632da4c 100644 --- a/lib/thread.cc +++ b/lib/thread.cc @@ -13,7 +13,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/ . + * along with this program. If not, see https://www.gnu.org/licenses/ . * * Author: Carl Worth */ @@ -24,7 +24,9 @@ #include #include /* GHashTable */ -struct visible _notmuch_thread { +#define EMPTY_STRING(s) ((s)[0] == '\0') + +struct _notmuch_thread { notmuch_database_t *notmuch; char *thread_id; char *subject; @@ -42,6 +44,7 @@ struct visible _notmuch_thread { GHashTable *message_hash; int total_messages; + int total_files; int matched_messages; time_t oldest; time_t newest; @@ -56,12 +59,12 @@ _notmuch_thread_destructor (notmuch_thread_t *thread) g_hash_table_unref (thread->message_hash); if (thread->authors_array) { - g_ptr_array_free (thread->authors_array, TRUE); + g_ptr_array_free (thread->authors_array, true); thread->authors_array = NULL; } if (thread->matched_authors_array) { - g_ptr_array_free (thread->matched_authors_array, TRUE); + g_ptr_array_free (thread->matched_authors_array, true); thread->matched_authors_array = NULL; } @@ -153,9 +156,9 @@ _resolve_thread_authors_string (notmuch_thread_t *thread) first_non_matched_author = 0; } - g_ptr_array_free (thread->authors_array, TRUE); + g_ptr_array_free (thread->authors_array, true); thread->authors_array = NULL; - g_ptr_array_free (thread->matched_authors_array, TRUE); + g_ptr_array_free (thread->matched_authors_array, true); thread->matched_authors_array = NULL; } @@ -236,7 +239,7 @@ _thread_add_message (notmuch_thread_t *thread, InternetAddress *address; const char *from, *author; char *clean_author; - notmuch_bool_t message_excluded = FALSE; + bool message_excluded = false; if (omit_exclude != NOTMUCH_EXCLUDE_FALSE) { for (tags = notmuch_message_get_tags (message); @@ -249,9 +252,9 @@ _thread_add_message (notmuch_thread_t *thread, term != NULL; term = term->next) { - /* We ignore initial 'K'. */ - if (strcmp(tag, (term->string + 1)) == 0) { - message_excluded = TRUE; + /* Check for an empty string, and then ignore initial 'K'. */ + if (*(term->string) && strcmp(tag, (term->string + 1)) == 0) { + message_excluded = true; break; } } @@ -264,6 +267,7 @@ _thread_add_message (notmuch_thread_t *thread, _notmuch_message_list_add_message (thread->message_list, talloc_steal (thread, message)); thread->total_messages++; + thread->total_files += notmuch_message_count_files (message); g_hash_table_insert (thread->message_hash, xstrdup (notmuch_message_get_message_id (message)), @@ -277,7 +281,8 @@ _thread_add_message (notmuch_thread_t *thread, address = internet_address_list_get_address (list, 0); if (address) { author = internet_address_get_name (address); - if (author == NULL) { + /* We treat quoted empty names as if they were empty. */ + if (author == NULL || author[0] == '\0') { InternetAddressMailbox *mailbox; mailbox = INTERNET_ADDRESS_MAILBOX (address); author = internet_address_mailbox_get_addr (mailbox); @@ -305,7 +310,7 @@ _thread_add_message (notmuch_thread_t *thread, /* Mark excluded messages. */ if (message_excluded) - notmuch_message_set_flag (message, NOTMUCH_MESSAGE_FLAG_EXCLUDED, TRUE); + notmuch_message_set_flag (message, NOTMUCH_MESSAGE_FLAG_EXCLUDED, true); } static void @@ -331,10 +336,12 @@ _thread_set_subject_from_message (notmuch_thread_t *thread, cleaned_subject = talloc_strdup (thread, subject); } - if (thread->subject) - talloc_free (thread->subject); + if (! EMPTY_STRING(cleaned_subject)) { + if (thread->subject) + talloc_free (thread->subject); - thread->subject = talloc_strdup (thread, cleaned_subject); + thread->subject = talloc_strdup (thread, cleaned_subject); + } } /* Add a message to this thread which is known to match the original @@ -359,7 +366,8 @@ _thread_add_matched_message (notmuch_thread_t *thread, if (date > thread->newest || ! thread->matched_messages) { thread->newest = date; - if (sort != NOTMUCH_SORT_OLDEST_FIRST) + const char *cur_subject = notmuch_thread_get_subject(thread); + if (sort != NOTMUCH_SORT_OLDEST_FIRST || EMPTY_STRING(cur_subject)) _thread_set_subject_from_message (thread, message); } @@ -441,6 +449,7 @@ _notmuch_thread_create (void *ctx, notmuch_messages_t *messages; notmuch_message_t *message; + notmuch_status_t status; seed_message = _notmuch_message_create (local, notmuch, seed_doc_id, NULL); if (! seed_message) @@ -488,6 +497,7 @@ _notmuch_thread_create (void *ctx, free, NULL); thread->total_messages = 0; + thread->total_files = 0; thread->matched_messages = 0; thread->oldest = 0; thread->newest = 0; @@ -498,7 +508,11 @@ _notmuch_thread_create (void *ctx, * oldest or newest subject is desired. */ notmuch_query_set_sort (thread_id_query, NOTMUCH_SORT_OLDEST_FIRST); - for (messages = notmuch_query_search_messages (thread_id_query); + status = notmuch_query_search_messages (thread_id_query, &messages); + if (status) + goto DONE; + + for (; notmuch_messages_valid (messages); notmuch_messages_move_to_next (messages)) { @@ -555,6 +569,12 @@ notmuch_thread_get_total_messages (notmuch_thread_t *thread) return thread->total_messages; } +int +notmuch_thread_get_total_files (notmuch_thread_t *thread) +{ + return thread->total_files; +} + int notmuch_thread_get_matched_messages (notmuch_thread_t *thread) {