notmuch_database_t *notmuch;
char *thread_id;
char *subject;
+ GHashTable *authors_hash;
char *authors;
GHashTable *tags;
- notmuch_bool_t has_message;
+ notmuch_message_list_t *message_list;
+ GHashTable *message_hash;
+ int total_messages;
+ int matched_messages;
time_t oldest;
time_t newest;
};
static int
_notmuch_thread_destructor (notmuch_thread_t *thread)
{
+ g_hash_table_unref (thread->authors_hash);
g_hash_table_unref (thread->tags);
+ g_hash_table_unref (thread->message_hash);
return 0;
}
+static void
+_thread_add_author (notmuch_thread_t *thread,
+ const char *author)
+{
+ if (author == NULL)
+ return;
+
+ if (g_hash_table_lookup_extended (thread->authors_hash,
+ author, NULL, NULL))
+ return;
+
+ g_hash_table_insert (thread->authors_hash, xstrdup (author), NULL);
+
+ if (thread->authors)
+ thread->authors = talloc_asprintf (thread, "%s, %s",
+ thread->authors,
+ author);
+ else
+ 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)
{
notmuch_tags_t *tags;
const char *tag;
- time_t date;
InternetAddressList *list;
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) {
mailbox = INTERNET_ADDRESS_MAILBOX (address);
author = internet_address_mailbox_get_addr (mailbox);
}
- if (author) {
- if (thread->authors)
- thread->authors = talloc_asprintf (thread, "%s, %s",
- thread->authors,
- author);
- else
- thread->authors = talloc_strdup (thread, author);
- }
+ _thread_add_author (thread, author);
}
g_object_unref (G_OBJECT (list));
}
tag = notmuch_tags_get (tags);
g_hash_table_insert (thread->tags, xstrdup (tag), NULL);
}
+}
+
+static void
+_thread_add_matched_message (notmuch_thread_t *thread,
+ notmuch_message_t *message)
+{
+ time_t date;
date = notmuch_message_get_date (message);
- if (date < thread->oldest || ! thread->has_message)
+ if (date < thread->oldest || ! thread->matched_messages)
thread->oldest = date;
- if (date > thread->newest || ! thread->has_message)
+ if (date > thread->newest || ! thread->matched_messages)
thread->newest = date;
- thread->has_message = 1;
+ thread->matched_messages++;
}
-/* Create a new notmuch_thread_t object for the given thread ID.
- *
- * Creating the thread will trigger a database search for the messages
- * belonging to the thread so that the thread object can return some
- * details about them, (authors, subject, etc.).
+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,
+ * treating any messages matching 'query_string' as "matched".
*
- * Here, 'talloc owner' is an optional talloc context to which the new
- * thread will belong. This allows for the caller to not bother
- * calling notmuch_thread_destroy on the thread, and know that all
- * memory will be reclaimed with 'talloc_owner' is freed. The caller
- * still can call notmuch_thread_destroy when finished with the
- * thread if desired.
+ * Creating the thread will trigger two database searches. The first
+ * is for all messages belonging to the thread, (to get the first
+ * 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
+ * messages differently.
*
- * The 'talloc_owner' argument can also be NULL, in which case the
- * caller *is* responsible for calling notmuch_thread_destroy.
+ * Here, 'ctx' is talloc context for the resulting thread object.
*
* This function returns NULL in the case of any error.
*/
notmuch_thread_t *
-_notmuch_thread_create (const void *ctx,
+_notmuch_thread_create (void *ctx,
notmuch_database_t *notmuch,
- const char *thread_id)
+ const char *thread_id,
+ const char *query_string)
{
notmuch_thread_t *thread;
- const char *query_string;
- notmuch_query_t *query;
+ const char *thread_id_query_string, *matched_query_string;
+ notmuch_query_t *thread_id_query, *matched_query;
notmuch_messages_t *messages;
- query_string = talloc_asprintf (ctx, "thread:%s", thread_id);
+ thread_id_query_string = talloc_asprintf (ctx, "thread:%s", thread_id);
if (unlikely (query_string == NULL))
return NULL;
- query = notmuch_query_create (notmuch, query_string);
- if (unlikely (query == 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);
+ if (unlikely (matched_query_string == NULL))
+ return NULL;
+
+ thread_id_query = notmuch_query_create (notmuch, thread_id_query_string);
+ if (unlikely (thread_id_query == NULL))
+ return NULL;
+
+ matched_query = notmuch_query_create (notmuch, matched_query_string);
+ if (unlikely (thread_id_query == NULL))
return NULL;
thread = talloc (ctx, notmuch_thread_t);
thread->notmuch = notmuch;
thread->thread_id = talloc_strdup (thread, thread_id);
thread->subject = NULL;
+ thread->authors_hash = g_hash_table_new_full (g_str_hash, g_str_equal,
+ free, NULL);
thread->authors = NULL;
thread->tags = g_hash_table_new_full (g_str_hash, g_str_equal,
free, NULL);
- thread->has_message = 0;
+ 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 (query, NOTMUCH_SORT_DATE_OLDEST_FIRST);
+ notmuch_query_set_sort (thread_id_query, NOTMUCH_SORT_DATE);
- for (messages = notmuch_query_search_messages (query, 0, -1);
+ for (messages = notmuch_query_search_messages (thread_id_query, 0, -1);
notmuch_messages_has_more (messages);
notmuch_messages_advance (messages))
{
_thread_add_message (thread, notmuch_messages_get (messages));
}
- notmuch_query_destroy (query);
+ notmuch_query_destroy (thread_id_query);
+
+ for (messages = notmuch_query_search_messages (matched_query, 0, -1);
+ notmuch_messages_has_more (messages);
+ notmuch_messages_advance (messages))
+ {
+ _thread_add_matched_message (thread, notmuch_messages_get (messages));
+ }
+
+ 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)
{
return thread->thread_id;
}
+int
+notmuch_thread_get_total_messages (notmuch_thread_t *thread)
+{
+ return thread->total_messages;
+}
+
+int
+notmuch_thread_get_matched_messages (notmuch_thread_t *thread)
+{
+ return thread->matched_messages;
+}
+
const char *
notmuch_thread_get_authors (notmuch_thread_t *thread)
{
projects / notmuch / blobdiff