This new function asks the database to reindex a given message, using
the supplied indexopts.
This can be used, for example, to index the cleartext of an encrypted
message.
---
lib/message.cc | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
lib/notmuch.h | 14 +++++++++
2 files changed, 104 insertions(+), 1 deletion(-)
diff --git a/lib/message.cc b/lib/message.cc
index 8d72ea2..3b35418 100644
--- a/lib/message.cc
+++ b/lib/message.cc
@@ -529,7 +529,9 @@ static void
_notmuch_message_remove_terms (notmuch_message_t *message, const char *prefix)
{
Xapian::TermIterator i;
- size_t prefix_len = strlen (prefix);
+ size_t prefix_len = 0;
+
+ prefix_len = strlen (prefix);
while (1) {
i = message->doc.termlist_begin ();
@@ -1667,3 +1669,90 @@ _notmuch_message_database (notmuch_message_t *message)
{
return message->notmuch;
}
+
+notmuch_status_t
+notmuch_message_reindex (notmuch_message_t *message,
+ notmuch_indexopts_t *indexopts)
+{
+ notmuch_database_t *notmuch = NULL;
+ notmuch_status_t ret = NOTMUCH_STATUS_SUCCESS, status;
+ notmuch_tags_t *tags = NULL;
+ notmuch_filenames_t *filenames, *orig_filenames = NULL;
+ const char *filename = NULL, *tag = NULL;
+ notmuch_message_t *newmsg = NULL;
+ notmuch_bool_t readded = FALSE, skip;
+ const char *autotags[] = {
+ "attachment",
+ "encrypted",
+ "signed",
+ "index-decrypted",
+ "index-decryption-failed" };
+
+ if (message == NULL)
+ return NOTMUCH_STATUS_NULL_POINTER;
+
+ notmuch = _notmuch_message_database (message);
+
+ /* cache tags and filenames */
+ tags = notmuch_message_get_tags(message);
+ filenames = notmuch_message_get_filenames(message);
+ orig_filenames = notmuch_message_get_filenames(message);
+
+ /* walk through filenames, removing them until the message is gone */
+ for ( ; notmuch_filenames_valid (filenames);
+ notmuch_filenames_move_to_next (filenames)) {
+ filename = notmuch_filenames_get (filenames);
+
+ ret = notmuch_database_remove_message (notmuch, filename);
+ if (ret != NOTMUCH_STATUS_SUCCESS &&
+ ret != NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID)
+ return ret;
+ }
+ if (ret != NOTMUCH_STATUS_SUCCESS)
+ return ret;
+
+ /* re-add the filenames with the associated indexopts */
+ for (; notmuch_filenames_valid (orig_filenames);
+ notmuch_filenames_move_to_next (orig_filenames)) {
+ filename = notmuch_filenames_get (orig_filenames);
+
+ status = notmuch_database_add_message_with_indexopts(notmuch,
+ filename,
+ indexopts,
+ readded ? NULL :
&newmsg);
+ if (status == NOTMUCH_STATUS_SUCCESS ||
+ status == NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID) {
+ if (!readded) {
+ /* re-add tags */
+ for (; notmuch_tags_valid (tags);
+ notmuch_tags_move_to_next (tags)) {
+ tag = notmuch_tags_get (tags);
+ skip = FALSE;
+
+ for (size_t i = 0; i < ARRAY_SIZE(autotags); i++)
+ if (strcmp (tag, autotags[i]) == 0)
+ skip = TRUE;
+
+ if (!skip) {
+ status = notmuch_message_add_tag (newmsg, tag);
+ if (status != NOTMUCH_STATUS_SUCCESS)
+ ret = status;
+ }
+ }
+ readded = TRUE;
+ }
+ } else {
+ /* if we failed to add this filename, go ahead and try the
+ * next one as though it were first, but report the
+ * error... */
+ ret = status;
+ }
+ }
+ if (newmsg)
+ notmuch_message_destroy (newmsg);
+
+ /* should we also destroy the incoming message object? at the
+ * moment, we leave that to the caller */
+ return ret;
+}
+
diff --git a/lib/notmuch.h b/lib/notmuch.h
index 854a451..e6287cd 100644
--- a/lib/notmuch.h
+++ b/lib/notmuch.h
@@ -1377,6 +1377,20 @@ notmuch_filenames_t *
notmuch_message_get_filenames (notmuch_message_t *message);
/**
+ * Re-index the e-mail corresponding to 'message' using the supplied index
options
+ *
+ * Returns the status of the re-index operation. (see the return
+ * codes documented in notmuch_database_add_message)
+ *
+ * After reindexing, the user should discard the message object passed
+ * in here by calling notmuch_message_destroy, since it refers to the
+ * original message, not to the reindexed message.
+ */
+notmuch_status_t
+notmuch_message_reindex (notmuch_message_t *message,
+ notmuch_indexopts_t *indexopts);
+
+/**
* Message flags.
*/
typedef enum _notmuch_message_flag {
--
2.7.0.rc3
_______________________________________________
notmuch mailing list
[email protected]
https://notmuchmail.org/mailman/listinfo/notmuch
