diff options
| author | David Bremner <david@tethera.net> | 2021-02-23 15:56:47 -0400 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2021-03-27 09:26:14 -0300 |
| commit | 2e39ce6eb5d5e5ae2a2a4ed419190003f47e566e (patch) | |
| tree | 38aa58aa45e6126ee0c2230bb54a60e033809a63 | |
| parent | dd9112e7d8e89e8566b90379f5f3b1461a2d2845 (diff) | |
lib: add NOTMUCH_STATUS_NO_DATABASE
This will allow more precise return values from various open related functions.
| -rw-r--r-- | bindings/python-cffi/notmuch2/_build.py | 1 | ||||
| -rw-r--r-- | bindings/python-cffi/notmuch2/_errors.py | 3 | ||||
| -rw-r--r-- | lib/database.cc | 2 | ||||
| -rw-r--r-- | lib/notmuch-private.h | 1 | ||||
| -rw-r--r-- | lib/notmuch.h | 4 |
5 files changed, 11 insertions, 0 deletions
diff --git a/bindings/python-cffi/notmuch2/_build.py b/bindings/python-cffi/notmuch2/_build.py index f67b4de6..f712b6c5 100644 --- 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_NO_DATABASE, NOTMUCH_STATUS_DATABASE_EXISTS, NOTMUCH_STATUS_LAST_STATUS } notmuch_status_t; diff --git a/bindings/python-cffi/notmuch2/_errors.py b/bindings/python-cffi/notmuch2/_errors.py index 65064d4e..9301073e 100644 --- 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, + capi.lib.NOTMUCH_STATUS_NO_DATABASE: + NoDatabaseError, capi.lib.NOTMUCH_STATUS_DATABASE_EXISTS: DatabaseExistsError, } @@ -99,6 +101,7 @@ class UpgradeRequiredError(NotmuchError): pass class PathError(NotmuchError): pass class IllegalArgumentError(NotmuchError): pass class NoConfigError(NotmuchError): pass +class NoDatabaseError(NotmuchError): pass class DatabaseExistsError(NotmuchError): pass class ObjectDestroyedError(NotmuchError): diff --git a/lib/database.cc b/lib/database.cc index d2ccdd58..96458f6f 100644 --- a/lib/database.cc +++ b/lib/database.cc @@ -305,6 +305,8 @@ notmuch_status_to_string (notmuch_status_t status) return "Unknown crypto protocol"; case NOTMUCH_STATUS_NO_CONFIG: return "No configuration file found"; + case NOTMUCH_STATUS_NO_DATABASE: + return "No database found"; case NOTMUCH_STATUS_DATABASE_EXISTS: return "Database exists, not recreated"; default: diff --git a/lib/notmuch-private.h b/lib/notmuch-private.h index 387f0c1e..10b1b024 100644 --- a/lib/notmuch-private.h +++ b/lib/notmuch-private.h @@ -142,6 +142,7 @@ typedef enum _notmuch_private_status { NOTMUCH_PRIVATE_STATUS_FAILED_CRYPTO_CONTEXT_CREATION = NOTMUCH_STATUS_FAILED_CRYPTO_CONTEXT_CREATION, NOTMUCH_PRIVATE_STATUS_UNKNOWN_CRYPTO_PROTOCOL = NOTMUCH_STATUS_UNKNOWN_CRYPTO_PROTOCOL, NOTMUCH_PRIVATE_STATUS_NO_CONFIG = NOTMUCH_STATUS_NO_CONFIG, + NOTMUCH_PRIVATE_STATUS_NO_DATABASE = NOTMUCH_STATUS_NO_DATABASE, NOTMUCH_PRIVATE_STATUS_DATABASE_EXISTS = NOTMUCH_STATUS_DATABASE_EXISTS, /* Then add our own private values. */ diff --git a/lib/notmuch.h b/lib/notmuch.h index 2a013be0..9ea05fc5 100644 --- a/lib/notmuch.h +++ b/lib/notmuch.h @@ -213,6 +213,10 @@ typedef enum _notmuch_status { */ NOTMUCH_STATUS_NO_CONFIG, /** + * Unable to load a database + */ + NOTMUCH_STATUS_NO_DATABASE, + /** * Database exists, so not (re)-created */ NOTMUCH_STATUS_DATABASE_EXISTS, |