lib: Indicate if there are more filenames after removal.

[notmuch] / lib / message.cc

diff --git a/lib/message.cc b/lib/message.cc
index 8b9c84f942f93359cf16e1d2895221922397fb3f..20b77580227b8c94a1b12b1a9e3cac050a2236ce 100644 (file)
--- a/lib/message.cc
+++ b/lib/message.cc
@@ -501,6 +501,9 @@ _notmuch_message_add_filename (notmuch_message_t *message,
  * This change will not be reflected in the database until the next
  * call to _notmuch_message_sync.
  *
+ * If this message still has other filenames, returns
+ * NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID.
+ *
  * Note: This function does not remove a document from the database,
  * even if the specified filename is the only filename for this
  * message. For that functionality, see
@@ -514,6 +517,8 @@ _notmuch_message_remove_filename (notmuch_message_t *message,
     const char *folder_prefix = _find_prefix ("folder");
     int folder_prefix_len = strlen (folder_prefix);
     void *local = talloc_new (message);
+    char *zfolder_prefix = talloc_asprintf(local, "Z%s", folder_prefix);
+    int zfolder_prefix_len = strlen (zfolder_prefix);
     char *direntry;
     notmuch_private_status_t private_status;
     notmuch_status_t status;
@@ -529,10 +534,15 @@ _notmuch_message_remove_filename (notmuch_message_t *message,
                                                   "file-direntry", direntry);
     status = COERCE_STATUS (private_status,
                            "Unexpected error from _notmuch_message_remove_term");
+    if (status)
+       return status;
 
-    /* Re-synchronize "folder:" terms for this message. This requires
-     * first removing all "folder:" terms, then adding back terms for
-     * all remaining filenames of the message. */
+    /* Re-synchronize "folder:" terms for this message. This requires:
+     *  1. removing all "folder:" terms
+     *  2. removing all "folder:" stemmed terms
+     *  3. adding back terms for all remaining filenames of the message. */
+
+    /* 1. removing all "folder:" terms */
     while (1) {
        i = message->doc.termlist_begin ();
        i.skip_to (folder_prefix);
@@ -551,6 +561,26 @@ _notmuch_message_remove_filename (notmuch_message_t *message,
        }
     }
 
+    /* 2. removing all "folder:" stemmed terms */
+    while (1) {
+       i = message->doc.termlist_begin ();
+       i.skip_to (zfolder_prefix);
+
+       /* Terminate loop when no terms remain with desired prefix. */
+       if (i == message->doc.termlist_end () ||
+           strncmp ((*i).c_str (), zfolder_prefix, zfolder_prefix_len))
+       {
+           break;
+       }
+
+       try {
+           message->doc.remove_term ((*i));
+       } catch (const Xapian::InvalidArgumentError) {
+           /* Ignore failure to remove non-existent term. */
+       }
+    }
+
+    /* 3. adding back terms for all remaining filenames of the message. */
     i = message->doc.termlist_begin ();
     i.skip_to (direntry_prefix);
 
@@ -563,6 +593,9 @@ _notmuch_message_remove_filename (notmuch_message_t *message,
        if (strncmp ((*i).c_str (), direntry_prefix, direntry_prefix_len))
            break;
 
+       /* Indicate that there are filenames remaining. */
+       status = NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID;
+
        direntry = (*i).c_str ();
        direntry += direntry_prefix_len;
 
@@ -1255,7 +1288,8 @@ notmuch_message_tags_to_maildir_flags (notmuch_message_t *message)
            new_status = _notmuch_message_remove_filename (message,
                                                           filename);
            /* Hold on to only the first error. */
-           if (! status && new_status) {
+           if (! status && new_status
+               && new_status != NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID) {
                status = new_status;
                continue;
            }