debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-21 18:38:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

lib: add NOTMUCH_STATUS_NO_DATABASE

Browse source 
This will allow more precise return values from various open related functions.
This commit is contained in:
David Bremner 2021-02-23 15:56:47 -04:00
parent dd9112e7d8
commit 2e39ce6eb5
5 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
bindings/python-cffi/notmuch2/_build.py
View file

@ -51,6 +51,7 @@ ffibuilder.cdef(
NOTMUCH_STATUS_FAILED_CRYPTO_CONTEXT_CREATION, NOTMUCH_STATUS_FAILED_CRYPTO_CONTEXT_CREATION,
NOTMUCH_STATUS_UNKNOWN_CRYPTO_PROTOCOL, NOTMUCH_STATUS_UNKNOWN_CRYPTO_PROTOCOL,
NOTMUCH_STATUS_NO_CONFIG, NOTMUCH_STATUS_NO_CONFIG,
NOTMUCH_STATUS_NO_DATABASE,
NOTMUCH_STATUS_DATABASE_EXISTS, NOTMUCH_STATUS_DATABASE_EXISTS,
NOTMUCH_STATUS_LAST_STATUS NOTMUCH_STATUS_LAST_STATUS
} notmuch_status_t; } notmuch_status_t;

3
bindings/python-cffi/notmuch2/_errors.py
View file

@ -52,6 +52,8 @@ class NotmuchError(Exception):
IllegalArgumentError, IllegalArgumentError,
capi.lib.NOTMUCH_STATUS_NO_CONFIG: capi.lib.NOTMUCH_STATUS_NO_CONFIG:
NoConfigError, NoConfigError,
capi.lib.NOTMUCH_STATUS_NO_DATABASE:
NoDatabaseError,
capi.lib.NOTMUCH_STATUS_DATABASE_EXISTS: capi.lib.NOTMUCH_STATUS_DATABASE_EXISTS:
DatabaseExistsError, DatabaseExistsError,
} }
@ -99,6 +101,7 @@ class UpgradeRequiredError(NotmuchError): pass
class PathError(NotmuchError): pass class PathError(NotmuchError): pass
class IllegalArgumentError(NotmuchError): pass class IllegalArgumentError(NotmuchError): pass
class NoConfigError(NotmuchError): pass class NoConfigError(NotmuchError): pass
class NoDatabaseError(NotmuchError): pass
class DatabaseExistsError(NotmuchError): pass class DatabaseExistsError(NotmuchError): pass
class ObjectDestroyedError(NotmuchError): class ObjectDestroyedError(NotmuchError):

2
lib/database.cc
View file

@ -305,6 +305,8 @@ notmuch_status_to_string (notmuch_status_t status)
return "Unknown crypto protocol"; return "Unknown crypto protocol";
case NOTMUCH_STATUS_NO_CONFIG: case NOTMUCH_STATUS_NO_CONFIG:
return "No configuration file found"; return "No configuration file found";
case NOTMUCH_STATUS_NO_DATABASE:
return "No database found";
case NOTMUCH_STATUS_DATABASE_EXISTS: case NOTMUCH_STATUS_DATABASE_EXISTS:
return "Database exists, not recreated"; return "Database exists, not recreated";
default: default:

1
lib/notmuch-private.h
View file

@ -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_FAILED_CRYPTO_CONTEXT_CREATION = NOTMUCH_STATUS_FAILED_CRYPTO_CONTEXT_CREATION,
NOTMUCH_PRIVATE_STATUS_UNKNOWN_CRYPTO_PROTOCOL = NOTMUCH_STATUS_UNKNOWN_CRYPTO_PROTOCOL, NOTMUCH_PRIVATE_STATUS_UNKNOWN_CRYPTO_PROTOCOL = NOTMUCH_STATUS_UNKNOWN_CRYPTO_PROTOCOL,
NOTMUCH_PRIVATE_STATUS_NO_CONFIG = NOTMUCH_STATUS_NO_CONFIG, 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, NOTMUCH_PRIVATE_STATUS_DATABASE_EXISTS = NOTMUCH_STATUS_DATABASE_EXISTS,
/* Then add our own private values. */ /* Then add our own private values. */

4
lib/notmuch.h
View file

@ -212,6 +212,10 @@ typedef enum _notmuch_status {
* Unable to load a config file * Unable to load a config file
*/ */
NOTMUCH_STATUS_NO_CONFIG, NOTMUCH_STATUS_NO_CONFIG,
/**
* Unable to load a database
*/
NOTMUCH_STATUS_NO_DATABASE,
/** /**
* Database exists, so not (re)-created * Database exists, so not (re)-created
*/ */