Catch and optionally print about exception at database->flush.

[notmuch] / lib / database.cc

diff --git a/lib/database.cc b/lib/database.cc
index 65478b8a30c4ec217c293c95675d0090afa25dba..bcea88b029e7a097a7887c7570e5715e7a78fc76 100644 (file)
--- a/lib/database.cc
+++ b/lib/database.cc
@@ -172,6 +172,8 @@ notmuch_status_to_string (notmuch_status_t status)
        return "No error occurred";
     case NOTMUCH_STATUS_OUT_OF_MEMORY:
        return "Out of memory";
+    case NOTMUCH_STATUS_READONLY_DATABASE:
+       return "The database is read-only";
     case NOTMUCH_STATUS_XAPIAN_EXCEPTION:
        return "A Xapian exception occurred";
     case NOTMUCH_STATUS_FILE_ERROR:
@@ -185,7 +187,7 @@ notmuch_status_to_string (notmuch_status_t status)
     case NOTMUCH_STATUS_TAG_TOO_LONG:
        return "Tag value is too long (exceeds NOTMUCH_TAG_MAX)";
     case NOTMUCH_STATUS_UNBALANCED_FREEZE_THAW:
-       return "Unblanced number of calls to notmuch_message_freeze/thaw";
+       return "Unbalanced number of calls to notmuch_message_freeze/thaw";
     default:
     case NOTMUCH_STATUS_LAST_STATUS:
        return "Unknown error status value";
@@ -323,7 +325,7 @@ _parse_message_id (void *ctx, const char *message_id, const char **next)
     const char *s, *end;
     char *result;
 
-    if (message_id == NULL)
+    if (message_id == NULL || *message_id == '\0')
        return NULL;
 
     s = message_id;
@@ -391,7 +393,7 @@ parse_references (void *ctx,
 {
     char *ref;
 
-    if (refs == NULL)
+    if (refs == NULL || *refs == '\0')
        return;
 
     while (*refs) {
@@ -438,7 +440,8 @@ notmuch_database_create (const char *path)
        goto DONE;
     }
 
-    notmuch = notmuch_database_open (path);
+    notmuch = notmuch_database_open (path,
+                                    NOTMUCH_DATABASE_MODE_READ_WRITE);
 
   DONE:
     if (notmuch_path)
@@ -448,7 +451,8 @@ notmuch_database_create (const char *path)
 }
 
 notmuch_database_t *
-notmuch_database_open (const char *path)
+notmuch_database_open (const char *path,
+                      notmuch_database_mode_t mode)
 {
     notmuch_database_t *notmuch = NULL;
     char *notmuch_path = NULL, *xapian_path = NULL;
@@ -476,14 +480,20 @@ notmuch_database_open (const char *path)
     }
 
     notmuch = talloc (NULL, notmuch_database_t);
+    notmuch->exception_reported = FALSE;
     notmuch->path = talloc_strdup (notmuch, path);
 
     if (notmuch->path[strlen (notmuch->path) - 1] == '/')
        notmuch->path[strlen (notmuch->path) - 1] = '\0';
 
+    notmuch->mode = mode;
     try {
-       notmuch->xapian_db = new Xapian::WritableDatabase (xapian_path,
-                                                          Xapian::DB_CREATE_OR_OPEN);
+       if (mode == NOTMUCH_DATABASE_MODE_READ_WRITE) {
+           notmuch->xapian_db = new Xapian::WritableDatabase (xapian_path,
+                                                              Xapian::DB_CREATE_OR_OPEN);
+       } else {
+           notmuch->xapian_db = new Xapian::Database (xapian_path);
+       }
        notmuch->query_parser = new Xapian::QueryParser;
        notmuch->term_gen = new Xapian::TermGenerator;
        notmuch->term_gen->set_stemmer (Xapian::Stem ("english"));
@@ -504,7 +514,7 @@ notmuch_database_open (const char *path)
            notmuch->query_parser->add_prefix (prefix->name, prefix->prefix);
        }
     } catch (const Xapian::Error &error) {
-       fprintf (stderr, "A Xapian exception occurred: %s\n",
+       fprintf (stderr, "A Xapian exception occurred opening database: %s\n",
                 error.get_msg().c_str());
        notmuch = NULL;
     }
@@ -521,7 +531,15 @@ notmuch_database_open (const char *path)
 void
 notmuch_database_close (notmuch_database_t *notmuch)
 {
-    notmuch->xapian_db->flush ();
+    try {
+       if (notmuch->mode == NOTMUCH_DATABASE_MODE_READ_WRITE)
+           (static_cast <Xapian::WritableDatabase *> (notmuch->xapian_db))->flush ();
+    } catch (const Xapian::Error &error) {
+       if (! notmuch->exception_reported) {
+           fprintf (stderr, "Error: A Xapian exception occurred flushing database: %s\n",
+                    error.get_msg().c_str());
+       }
+    }
 
     delete notmuch->term_gen;
     delete notmuch->query_parser;
@@ -567,11 +585,18 @@ notmuch_database_set_timestamp (notmuch_database_t *notmuch,
                                const char *key, time_t timestamp)
 {
     Xapian::Document doc;
+    Xapian::WritableDatabase *db;
     unsigned int doc_id;
     notmuch_private_status_t status;
     notmuch_status_t ret = NOTMUCH_STATUS_SUCCESS;
     char *db_key = NULL;
 
+    if (notmuch->mode == NOTMUCH_DATABASE_MODE_READ_ONLY) {
+       fprintf (stderr, "Attempted to update a read-only database.\n");
+       return NOTMUCH_STATUS_READONLY_DATABASE;
+    }
+
+    db = static_cast <Xapian::WritableDatabase *> (notmuch->xapian_db);
     db_key = timestamp_db_key (key);
 
     try {
@@ -586,14 +611,15 @@ notmuch_database_set_timestamp (notmuch_database_t *notmuch,
            doc.add_term (term);
            talloc_free (term);
 
-           notmuch->xapian_db->add_document (doc);
+           db->add_document (doc);
        } else {
-           notmuch->xapian_db->replace_document (doc_id, doc);
+           db->replace_document (doc_id, doc);
        }
 
-    } catch (Xapian::Error &error) {
-       fprintf (stderr, "A Xapian exception occurred: %s.\n",
+    } catch (const Xapian::Error &error) {
+       fprintf (stderr, "A Xapian exception occurred setting timestamp: %s.\n",
                 error.get_msg().c_str());
+       notmuch->exception_reported = TRUE;
        ret = NOTMUCH_STATUS_XAPIAN_EXCEPTION;
     }
 
@@ -726,7 +752,8 @@ _notmuch_database_link_message_to_parents (notmuch_database_t *notmuch,
 
     /* Carefully avoid adding any self-referential in-reply-to term. */
     in_reply_to_message_id = _parse_message_id (message, in_reply_to, NULL);
-    if (strcmp (in_reply_to_message_id,
+    if (in_reply_to_message_id &&
+       strcmp (in_reply_to_message_id,
                notmuch_message_get_message_id (message)))
     {
        _notmuch_message_add_term (message, "replyto",
@@ -895,9 +922,9 @@ notmuch_database_add_message (notmuch_database_t *notmuch,
        subject = notmuch_message_file_get_header (message_file, "subject");
        to = notmuch_message_file_get_header (message_file, "to");
 
-       if (from == NULL &&
-           subject == NULL &&
-           to == NULL)
+       if ((from == NULL || *from == '\0') &&
+           (subject == NULL || *subject == '\0') &&
+           (to == NULL || *to == '\0'))
        {
            ret = NOTMUCH_STATUS_FILE_NOT_EMAIL;
            goto DONE;
@@ -907,7 +934,7 @@ notmuch_database_add_message (notmuch_database_t *notmuch,
         * is to find a message ID (or else create one ourselves). */
 
        header = notmuch_message_file_get_header (message_file, "message-id");
-       if (header) {
+       if (header && *header != '\0') {
            message_id = _parse_message_id (message_file, header, NULL);
            /* So the header value isn't RFC-compliant, but it's
             * better than no message-id at all. */
@@ -939,8 +966,11 @@ notmuch_database_add_message (notmuch_database_t *notmuch,
 
        talloc_free (message_id);
 
-       if (message == NULL)
+       if (message == NULL) {
+           ret = COERCE_STATUS (private_status,
+                                "Unexpected status value from _notmuch_message_create_for_message_id");
            goto DONE;
+       }
 
        /* Is this a newly created message object? */
        if (private_status == NOTMUCH_PRIVATE_STATUS_NO_DOCUMENT_FOUND) {
@@ -962,8 +992,9 @@ notmuch_database_add_message (notmuch_database_t *notmuch,
 
        _notmuch_message_sync (message);
     } catch (const Xapian::Error &error) {
-       fprintf (stderr, "A Xapian exception occurred: %s.\n",
-                error.get_msg().c_str());
+       fprintf (stderr, "A Xapian exception occurred adding message: %s.\n",
+                error.get_description().c_str());
+       notmuch->exception_reported = TRUE;
        ret = NOTMUCH_STATUS_XAPIAN_EXCEPTION;
        goto DONE;
     }