From 0a7181dd163babefaefa9988ed51dc66c892eb3e Mon Sep 17 00:00:00 2001 From: David Bremner Date: Thu, 30 Aug 2018 08:29:08 -0300 Subject: [PATCH] lib: calculate message depth in thread This will be used in reparenting messages without useful in-reply-to, but with useful references --- lib/message.cc | 23 +++++++++++++++++++++++ lib/notmuch-private.h | 6 ++++++ 2 files changed, 29 insertions(+) diff --git a/lib/message.cc b/lib/message.cc index 9d090bcf..6f2f6345 100644 --- a/lib/message.cc +++ b/lib/message.cc @@ -32,6 +32,7 @@ struct _notmuch_message { int frozen; char *message_id; char *thread_id; + size_t thread_depth; char *in_reply_to; notmuch_string_list_t *tag_list; notmuch_string_list_t *filename_term_list; @@ -118,6 +119,9 @@ _notmuch_message_create_for_document (const void *talloc_owner, /* the message is initially not synchronized with Xapian */ message->last_view = 0; + /* Calculated after the thread structure is computed */ + message->thread_depth = 0; + /* Each of these will be lazily created as needed. */ message->message_id = NULL; message->thread_id = NULL; @@ -599,6 +603,25 @@ _notmuch_message_add_reply (notmuch_message_t *message, _notmuch_message_list_add_message (message->replies, reply); } +size_t +_notmuch_message_get_thread_depth (notmuch_message_t *message) { + return message->thread_depth; +} + +void +_notmuch_message_label_depths (notmuch_message_t *message, + size_t depth) +{ + message->thread_depth = depth; + + for (notmuch_messages_t *messages = _notmuch_messages_create (message->replies); + notmuch_messages_valid (messages); + notmuch_messages_move_to_next (messages)) { + notmuch_message_t *child = notmuch_messages_get (messages); + _notmuch_message_label_depths (child, depth+1); + } +} + const notmuch_string_list_t * _notmuch_message_get_references (notmuch_message_t *message) { diff --git a/lib/notmuch-private.h b/lib/notmuch-private.h index 590a3451..94fc54d7 100644 --- a/lib/notmuch-private.h +++ b/lib/notmuch-private.h @@ -543,6 +543,12 @@ _notmuch_message_remove_unprefixed_terms (notmuch_message_t *message); const char * _notmuch_message_get_thread_id_only(notmuch_message_t *message); +size_t _notmuch_message_get_thread_depth (notmuch_message_t *message); + +void +_notmuch_message_label_depths (notmuch_message_t *message, + size_t depth); + notmuch_message_list_t * _notmuch_message_sort_subtrees (void *ctx, notmuch_message_list_t *list); -- 2.43.0