debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-24 20:08:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

lib/thread: refactor in_reply_to test

Browse source 
This is not a complete win in code-size, but it makes the code (which
is about to get more complicated) easier to follow.
This commit is contained in:
David Bremner 2018-08-30 08:29:06 -03:00
parent dc3cc18bf0
commit b9d4eb0412
1 changed files with 25 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
lib/thread.cc
View file

@ -393,12 +393,31 @@ _thread_add_matched_message (notmuch_thread_t *thread,
_thread_add_matched_author (thread, _notmuch_message_get_author (hashed_message)); _thread_add_matched_author (thread, _notmuch_message_get_author (hashed_message));
} }
static bool
_parent_via_in_reply_to (notmuch_thread_t *thread, notmuch_message_t *message) {
notmuch_message_t *parent;
const char *in_reply_to;
in_reply_to = _notmuch_message_get_in_reply_to (message);
THREAD_DEBUG("checking message = %s in_reply_to=%s\n",
notmuch_message_get_message_id (message), in_reply_to);
if (in_reply_to && strlen (in_reply_to) &&
g_hash_table_lookup_extended (thread->message_hash,
in_reply_to, NULL,
(void **) &parent)) {
_notmuch_message_add_reply (parent, message);
return true;
} else {
return false;
}
}
static void static void
_resolve_thread_relationships (notmuch_thread_t *thread) _resolve_thread_relationships (notmuch_thread_t *thread)
{ {
notmuch_message_node_t *node, *first_node; notmuch_message_node_t *node, *first_node;
notmuch_message_t *message, *parent; notmuch_message_t *message;
const char *in_reply_to;
first_node = thread->message_list->head; first_node = thread->message_list->head;
if (! first_node) if (! first_node)
@ -406,13 +425,7 @@ _resolve_thread_relationships (notmuch_thread_t *thread)
for (node = first_node->next; node; node = node->next) { for (node = first_node->next; node; node = node->next) {
message = node->message; message = node->message;
in_reply_to = _notmuch_message_get_in_reply_to (message); if (! _parent_via_in_reply_to (thread, message))
if (in_reply_to && strlen (in_reply_to) &&
g_hash_table_lookup_extended (thread->message_hash,
in_reply_to, NULL,
(void **) &parent))
_notmuch_message_add_reply (parent, message);
else
_notmuch_message_list_add_message (thread->toplevel_list, message); _notmuch_message_list_add_message (thread->toplevel_list, message);
} }
@ -424,15 +437,10 @@ _resolve_thread_relationships (notmuch_thread_t *thread)
*/ */
if (first_node) { if (first_node) {
message = first_node->message; message = first_node->message;
in_reply_to = _notmuch_message_get_in_reply_to (message); if (_notmuch_message_list_empty(thread->toplevel_list) ||
if (! _notmuch_message_list_empty (thread->toplevel_list) && ! _parent_via_in_reply_to (thread, message)) {
in_reply_to && strlen (in_reply_to) &&
g_hash_table_lookup_extended (thread->message_hash,
in_reply_to, NULL,
(void **) &parent))
_notmuch_message_add_reply (parent, message);
else
_notmuch_message_list_add_message (thread->toplevel_list, message); _notmuch_message_list_add_message (thread->toplevel_list, message);
}
} }
/* XXX this could be made conditional on messages being inserted /* XXX this could be made conditional on messages being inserted