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

[notmuch] / lib / database.cc

diff --git a/lib/database.cc b/lib/database.cc
index 207246cc5dc0387a04083c460b869515614fd970..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:
@@ -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;
     }
 
@@ -966,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;
     }