lib: add NOTMUCH_STATUS_DATABASE_EXISTS

It is desirable to distinguish between attempting to create a database
that already exists, and more fatal errors like permission problems.

diff --git a/bindings/python-cffi/notmuch2/_build.py b/bindings/python-cffi/notmuch2/_build.py
index 938286271f7e8bc665e2d4db38ed27b153f70b0d..f67b4de61001946f66f633ac1c91b2facd733ba7 100644 (file)
--- a/bindings/python-cffi/notmuch2/_build.py
+++ b/bindings/python-cffi/notmuch2/_build.py
@@ -51,6 +51,7 @@ ffibuilder.cdef(
         NOTMUCH_STATUS_FAILED_CRYPTO_CONTEXT_CREATION,
         NOTMUCH_STATUS_UNKNOWN_CRYPTO_PROTOCOL,
         NOTMUCH_STATUS_NO_CONFIG,
         NOTMUCH_STATUS_FAILED_CRYPTO_CONTEXT_CREATION,
         NOTMUCH_STATUS_UNKNOWN_CRYPTO_PROTOCOL,
         NOTMUCH_STATUS_NO_CONFIG,

+        NOTMUCH_STATUS_DATABASE_EXISTS,

         NOTMUCH_STATUS_LAST_STATUS
     } notmuch_status_t;
     typedef enum {
         NOTMUCH_STATUS_LAST_STATUS
     } notmuch_status_t;
     typedef enum {

diff --git a/bindings/python-cffi/notmuch2/_errors.py b/bindings/python-cffi/notmuch2/_errors.py
index c97d99cbde5fa9fac4e9c159b5c51dd3702ff6c8..65064d4eda470cf8f90a25bf38f0c75bf53ac62f 100644 (file)
--- a/bindings/python-cffi/notmuch2/_errors.py
+++ b/bindings/python-cffi/notmuch2/_errors.py
@@ -52,6 +52,8 @@ class NotmuchError(Exception):
                 IllegalArgumentError,
             capi.lib.NOTMUCH_STATUS_NO_CONFIG:
                 NoConfigError,
                 IllegalArgumentError,
             capi.lib.NOTMUCH_STATUS_NO_CONFIG:
                 NoConfigError,

+            capi.lib.NOTMUCH_STATUS_DATABASE_EXISTS:
+                DatabaseExistsError,

         }
         return types[status]
 
         }
         return types[status]
 


@@ -97,6 +99,7 @@ class UpgradeRequiredError(NotmuchError): pass
 class PathError(NotmuchError): pass
 class IllegalArgumentError(NotmuchError): pass
 class NoConfigError(NotmuchError): pass
 class PathError(NotmuchError): pass
 class IllegalArgumentError(NotmuchError): pass
 class NoConfigError(NotmuchError): pass

+class DatabaseExistsError(NotmuchError): pass

 
 class ObjectDestroyedError(NotmuchError):
     """The object has already been destroyed and it's memory freed.
 
 class ObjectDestroyedError(NotmuchError):
     """The object has already been destroyed and it's memory freed.

diff --git a/lib/notmuch.h b/lib/notmuch.h
index 4f384e58881faa7f1a0bc08a40550f45585ac808..6d22d328ce1b57f1b04ee445aaa2e44d9efb54e6 100644 (file)
--- a/lib/notmuch.h
+++ b/lib/notmuch.h
@@ -212,6 +212,10 @@ typedef enum _notmuch_status {
      * Unable to load a config file
      */
     NOTMUCH_STATUS_NO_CONFIG,
      * Unable to load a config file
      */
     NOTMUCH_STATUS_NO_CONFIG,

+    /**
+     * Database exists, so not (re)-created
+     */
+    NOTMUCH_STATUS_DATABASE_EXISTS,

     /**
      * Not an actual status value. Just a way to find out how many
      * valid status values there are.
     /**
      * Not an actual status value. Just a way to find out how many
      * valid status values there are.