From 7e02b448e7684a0b5619ccc1d9144441b909b618 Mon Sep 17 00:00:00 2001 From: Bart Trojanowski Date: Tue, 24 Nov 2009 23:25:31 -0500 Subject: [PATCH 1/3] message: add flags to notmuch_message_t This patch allows for different flags, internal to notmuch, to be set on a message object. The patch does not define any such flags, just the facilities to manage these flags. Signed-off-by: Bart Trojanowski --- lib/message.cc | 19 +++++++++++++++++++ lib/notmuch.h | 14 ++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/lib/message.cc b/lib/message.cc index 1e325e23..e0834f1c 100644 --- a/lib/message.cc +++ b/lib/message.cc @@ -37,6 +37,7 @@ struct _notmuch_message { char *filename; notmuch_message_file_t *message_file; notmuch_message_list_t *replies; + unsigned long flags; Xapian::Document doc; }; @@ -108,6 +109,7 @@ _notmuch_message_create (const void *talloc_owner, message->doc_id = doc_id; message->frozen = 0; + message->flags = 0; /* Each of these will be lazily created as needed. */ message->message_id = NULL; @@ -445,6 +447,23 @@ notmuch_message_get_filename (notmuch_message_t *message) return message->filename; } +notmuch_bool_t +notmuch_message_get_flag (notmuch_message_t *message, + notmuch_message_flag_t flag) +{ + return message->flags & (1 << flag); +} + +void +notmuch_message_set_flag (notmuch_message_t *message, + notmuch_message_flag_t flag, notmuch_bool_t enable) +{ + if (enable) + message->flags |= (1 << flag); + else + message->flags &= ~(1 << flag); +} + time_t notmuch_message_get_date (notmuch_message_t *message) { diff --git a/lib/notmuch.h b/lib/notmuch.h index 8bba442f..c232c580 100644 --- a/lib/notmuch.h +++ b/lib/notmuch.h @@ -684,6 +684,20 @@ notmuch_message_get_replies (notmuch_message_t *message); const char * notmuch_message_get_filename (notmuch_message_t *message); +/* Message flags */ +typedef enum _notmuch_message_flag { +} notmuch_message_flag_t; + +/* Get a value of a flag for the email corresponding to 'message'. */ +notmuch_bool_t +notmuch_message_get_flag (notmuch_message_t *message, + notmuch_message_flag_t flag); + +/* Set a value of a flag for the email corresponding to 'message'. */ +void +notmuch_message_set_flag (notmuch_message_t *message, + notmuch_message_flag_t flag, notmuch_bool_t value); + /* Get the date of 'message' as a time_t value. * * For the original textual representation of the Date header from the From 62878f71c2f2f1f8aabc6eeb3cab116bd38522db Mon Sep 17 00:00:00 2001 From: Bart Trojanowski Date: Tue, 24 Nov 2009 23:28:39 -0500 Subject: [PATCH 2/3] have _notmuch_thread_create mark which messages matched the query When _notmuch_thread_create() is given a query string, it can return more messages than just those matching the query. To distinguish those that matched the query expression, the MATCHING_SEARCH flag is set appropriately. Signed-off-by: Bart Trojanowski --- lib/notmuch.h | 1 + lib/thread.cc | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/lib/notmuch.h b/lib/notmuch.h index c232c580..3974820c 100644 --- a/lib/notmuch.h +++ b/lib/notmuch.h @@ -686,6 +686,7 @@ notmuch_message_get_filename (notmuch_message_t *message); /* Message flags */ typedef enum _notmuch_message_flag { + NOTMUCH_MSG_FLAG_MATCHING_SEARCH, } notmuch_message_flag_t; /* Get a value of a flag for the email corresponding to 'message'. */ diff --git a/lib/thread.cc b/lib/thread.cc index 58d88c2d..9e4cb5c8 100644 --- a/lib/thread.cc +++ b/lib/thread.cc @@ -132,6 +132,7 @@ _thread_add_matched_message (notmuch_thread_t *thread, notmuch_message_t *message) { time_t date; + notmuch_message_t *hashed_message; date = notmuch_message_get_date (message); @@ -142,6 +143,13 @@ _thread_add_matched_message (notmuch_thread_t *thread, 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 From b9e96ccb0d5242033704ff81fee0c720772a312f Mon Sep 17 00:00:00 2001 From: Bart Trojanowski Date: Tue, 24 Nov 2009 23:34:15 -0500 Subject: [PATCH 3/3] notmuch-show: identify which messages printed matched the query string The show command outputs all messages in the threads that match the search-terms. This patch introduces a 'match:[01]' entry to the 'message{' line output by the show command. Value of 1 indicates that the message is matching the search expression. Signed-off-by: Bart Trojanowski --- notmuch-show.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/notmuch-show.c b/notmuch-show.c index edebacaa..f189e943 100644 --- a/notmuch-show.c +++ b/notmuch-show.c @@ -155,9 +155,10 @@ show_message (void *ctx, notmuch_message_t *message, int indent) const char *name, *value; unsigned int i; - printf ("\fmessage{ id:%s depth:%d filename:%s\n", + printf ("\fmessage{ id:%s depth:%d match:%d filename:%s\n", notmuch_message_get_message_id (message), indent, + notmuch_message_get_flag (message, NOTMUCH_MSG_FLAG_MATCHING_SEARCH), notmuch_message_get_filename (message)); printf ("\fheader{\n");