lib: make find_message{,by_filename) report errors

[notmuch] / lib / message.cc

diff --git a/lib/message.cc b/lib/message.cc
index 2a4954dd59ce1d9c72fc0e2685459b730e79f699..8f22e02a5cde2d37a614febec9b7ad950dc08631 100644 (file)
--- a/lib/message.cc
+++ b/lib/message.cc
@@ -216,11 +216,13 @@ _notmuch_message_create_for_message_id (notmuch_database_t *notmuch,
     unsigned int doc_id;
     char *term;
 
-    *status_ret = NOTMUCH_PRIVATE_STATUS_SUCCESS;
-
-    message = notmuch_database_find_message (notmuch, message_id);
+    *status_ret = (notmuch_private_status_t) notmuch_database_find_message (notmuch,
+                                                                           message_id,
+                                                                           &message);
     if (message)
        return talloc_steal (notmuch, message);
+    else if (*status_ret)
+       return NULL;
 
     term = talloc_asprintf (NULL, "%s%s",
                            _find_prefix ("id"), message_id);
@@ -501,6 +503,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
@@ -531,6 +536,8 @@ _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:
      *  1. removing all "folder:" terms
@@ -588,6 +595,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;
 
@@ -814,6 +824,22 @@ _notmuch_message_sync (notmuch_message_t *message)
     db->replace_document (message->doc_id, message->doc);
 }
 
+/* Delete a message document from the database. */
+notmuch_status_t
+_notmuch_message_delete (notmuch_message_t *message)
+{
+    notmuch_status_t status;
+    Xapian::WritableDatabase *db;
+
+    status = _notmuch_database_ensure_writable (message->notmuch);
+    if (status)
+       return status;
+
+    db = static_cast <Xapian::WritableDatabase *> (message->notmuch->xapian_db);
+    db->delete_document (message->doc_id);
+    return NOTMUCH_STATUS_SUCCESS;
+}
+
 /* Ensure that 'message' is not holding any file object open. Future
  * calls to various functions will still automatically open the
  * message file as needed.
@@ -862,7 +888,7 @@ _notmuch_message_add_term (notmuch_message_t *message,
 
 /* Parse 'text' and add a term to 'message' for each parsed word. Each
  * term will be added both prefixed (if prefix_name is not NULL) and
- * also unprefixed). */
+ * also non-prefixed). */
 notmuch_private_status_t
 _notmuch_message_gen_terms (notmuch_message_t *message,
                            const char *prefix_name,
@@ -1280,7 +1306,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;
            }