char *authors;
GHashTable *tags;
+ notmuch_message_list_t *message_list;
+ GHashTable *message_hash;
int total_messages;
int matched_messages;
time_t oldest;
{
g_hash_table_unref (thread->authors_hash);
g_hash_table_unref (thread->tags);
+ g_hash_table_unref (thread->message_hash);
return 0;
}
thread->authors = talloc_strdup (thread, author);
}
+/* Add 'message' as a message that belongs to 'thread'.
+ *
+ * The 'thread' will talloc_steal the 'message' and hold onto a
+ * reference to it.
+ */
static void
_thread_add_message (notmuch_thread_t *thread,
notmuch_message_t *message)
InternetAddress *address;
const char *from, *author;
+ _notmuch_message_list_add_message (thread->message_list,
+ talloc_steal (thread, message));
+ thread->total_messages++;
+
+ g_hash_table_insert (thread->message_hash,
+ xstrdup (notmuch_message_get_message_id (message)),
+ message);
+
from = notmuch_message_get_header (message, "from");
list = internet_address_list_parse_string (from);
if (list) {
tag = notmuch_tags_get (tags);
g_hash_table_insert (thread->tags, xstrdup (tag), NULL);
}
-
- thread->total_messages++;
}
static void
notmuch_message_t *message)
{
time_t date;
+ notmuch_message_t *hashed_message;
date = notmuch_message_get_date (message);
thread->newest = date;
thread->matched_messages++;
+
+ if (g_hash_table_lookup_extended (thread->message_hash,
+ notmuch_message_get_message_id (message), NULL,
+ (void **) &hashed_message)) {
+ notmuch_message_set_flag (hashed_message,
+ NOTMUCH_MSG_FLAG_MATCHING_SEARCH, 1);
+ }
+}
+
+static void
+_resolve_thread_relationships (unused (notmuch_thread_t *thread))
+{
+ notmuch_message_node_t **prev, *node;
+ notmuch_message_t *message, *parent;
+ const char *in_reply_to;
+
+ prev = &thread->message_list->head;
+ while ((node = *prev)) {
+ message = node->message;
+ in_reply_to = _notmuch_message_get_in_reply_to (message);
+ if (in_reply_to && strlen (in_reply_to) &&
+ g_hash_table_lookup_extended (thread->message_hash,
+ in_reply_to, NULL,
+ (void **) &parent))
+ {
+ *prev = node->next;
+ if (thread->message_list->tail == &node->next)
+ thread->message_list->tail = prev;
+ node->next = NULL;
+ _notmuch_message_add_reply (parent, node);
+ } else {
+ prev = &((*prev)->next);
+ }
+ }
+
+ /* XXX: After scanning through the entire list looking for parents
+ * via "In-Reply-To", we should do a second pass that looks at the
+ * list of messages IDs in the "References" header instead. (And
+ * for this the parent would be the "deepest" message of all the
+ * messages found in the "References" list.)
+ *
+ * Doing this will allow messages and sub-threads to be positioned
+ * correctly in the thread even when an intermediate message is
+ * missing from the thread.
+ */
}
/* Create a new notmuch_thread_t object for the given thread ID,
* subject line, the total count of messages, and all authors). The
* second search is for all messages that are in the thread and that
* also match the given query_string. This is to allow for a separate
- * count of matched messages, and to allow a viewer to diplay these
+ * count of matched messages, and to allow a viewer to display these
* messages differently.
*
* Here, 'ctx' is talloc context for the resulting thread object.
const char *thread_id_query_string, *matched_query_string;
notmuch_query_t *thread_id_query, *matched_query;
notmuch_messages_t *messages;
+ notmuch_message_t *message;
thread_id_query_string = talloc_asprintf (ctx, "thread:%s", thread_id);
if (unlikely (query_string == NULL))
return NULL;
+ /* XXX: We could be a bit more efficient here if
+ * thread_id_query_string is identical to query_string, (then we
+ * could get by with just one database search instead of two). */
+
matched_query_string = talloc_asprintf (ctx, "%s AND (%s)",
thread_id_query_string,
query_string);
thread->tags = g_hash_table_new_full (g_str_hash, g_str_equal,
free, NULL);
+ thread->message_list = _notmuch_message_list_create (thread);
+ if (unlikely (thread->message_list == NULL))
+ return NULL;
+
+ thread->message_hash = g_hash_table_new_full (g_str_hash, g_str_equal,
+ free, NULL);
+
thread->total_messages = 0;
thread->matched_messages = 0;
thread->oldest = 0;
thread->newest = 0;
- notmuch_query_set_sort (thread_id_query, NOTMUCH_SORT_DATE);
+ notmuch_query_set_sort (thread_id_query, NOTMUCH_SORT_OLDEST_FIRST);
- for (messages = notmuch_query_search_messages (thread_id_query, 0, -1);
+ for (messages = notmuch_query_search_messages (thread_id_query);
notmuch_messages_has_more (messages);
notmuch_messages_advance (messages))
{
- _thread_add_message (thread, notmuch_messages_get (messages));
+ message = notmuch_messages_get (messages);
+ _thread_add_message (thread, message);
+ _notmuch_message_close (message);
}
notmuch_query_destroy (thread_id_query);
- for (messages = notmuch_query_search_messages (matched_query, 0, -1);
+ for (messages = notmuch_query_search_messages (matched_query);
notmuch_messages_has_more (messages);
notmuch_messages_advance (messages))
{
- _thread_add_matched_message (thread, notmuch_messages_get (messages));
+ message = notmuch_messages_get (messages);
+ _thread_add_matched_message (thread, message);
+ _notmuch_message_close (message);
}
notmuch_query_destroy (matched_query);
+ _resolve_thread_relationships (thread);
+
return thread;
}
+notmuch_messages_t *
+notmuch_thread_get_toplevel_messages (notmuch_thread_t *thread)
+{
+ return _notmuch_messages_create (thread->message_list);
+}
+
const char *
notmuch_thread_get_thread_id (notmuch_thread_t *thread)
{
projects / notmuch / blobdiff