From: David Bremner <david@tethera.net>
To: notmuch@notmuchmail.org
Cc: David Bremner <david@tethera.net>
Subject: [PATCH 22/28] lib: add NOTMUCH_STATUS_NO_DATABASE
Date: Tue, 6 Apr 2021 22:55:24 -0300 [thread overview]
Message-ID: <20210407015530.2964017-23-david@tethera.net> (raw)
In-Reply-To: <20210407015530.2964017-1-david@tethera.net>
This will allow more precise return values from various open related functions.
---
bindings/python-cffi/notmuch2/_build.py | 1 +
bindings/python-cffi/notmuch2/_errors.py | 3 +++
lib/database.cc | 2 ++
lib/notmuch-private.h | 1 +
lib/notmuch.h | 4 ++++
5 files changed, 11 insertions(+)
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
@@ -212,6 +212,10 @@ typedef enum _notmuch_status {
* Unable to load a config file
*/
NOTMUCH_STATUS_NO_CONFIG,
+ /**
+ * Unable to load a database
+ */
+ NOTMUCH_STATUS_NO_DATABASE,
/**
* Database exists, so not (re)-created
*/
--
2.30.2
next prev parent reply other threads:[~2021-04-07 1:56 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-07 1:55 v2 convert remaining CLI to new configuration David Bremner
2021-04-07 1:55 ` [PATCH 01/28] lib/open: fix leaks calling _trial_open David Bremner
2021-04-07 1:55 ` [PATCH 02/28] lib: add missing status strings David Bremner
2021-04-07 1:55 ` [PATCH 03/28] test: convert random-corpus to use n_d_open_with_config David Bremner
2021-04-07 1:55 ` [PATCH 04/28] lib/open: pull _load_key_file out of _choose_database_path David Bremner
2021-04-07 1:55 ` [PATCH 05/28] lib: provide notmuch_database_load_config David Bremner
2021-04-07 1:55 ` [PATCH 06/28] lib/config: add notmuch_config_get_values_string David Bremner
2021-04-07 1:55 ` [PATCH 07/28] lib/config: add config_pairs iterators David Bremner
2021-04-07 1:55 ` [PATCH 08/28] lib/config: set defaults for user full name David Bremner
2021-04-07 1:55 ` [PATCH 09/28] lib/config: set default for primary user email David Bremner
2021-04-07 1:55 ` [PATCH 10/28] lib/open: canonicalize relative path read from config file David Bremner
2021-04-07 1:55 ` [PATCH 11/28] CLI: load merged config at top level David Bremner
2021-04-07 1:55 ` [PATCH 12/28] CLI/config: use merged config for "config get" David Bremner
2021-04-07 1:55 ` [PATCH 13/28] test/setup: check file output instead of notmuch config list David Bremner
2021-04-07 1:55 ` [PATCH 14/28] CLI/setup: switch to new configuration framework David Bremner
2021-04-07 1:55 ` [PATCH 15/28] CLI/config: switch "notmuch config list" to merged config David Bremner
2021-04-07 1:55 ` [PATCH 16/28] CLI/config: migrate notmuch_config_open to new config David Bremner
2021-04-07 1:55 ` [PATCH 17/28] CLI/config: use notmuch_database_reopen David Bremner
2021-04-07 1:55 ` [PATCH 18/28] CLI/notmuch: switch notmuch_command to notmuch_config_get David Bremner
2021-04-07 1:55 ` [PATCH 19/28] CLI/config: drop obsolete notmuch_config_get_* David Bremner
2021-04-07 1:55 ` [PATCH 20/28] CLI/config: drop cached data from notmuch_config_t David Bremner
2021-04-07 1:55 ` [PATCH 21/28] CLI/config: default to storing all config in external files David Bremner
2021-04-07 1:55 ` David Bremner [this message]
2021-04-07 1:55 ` [PATCH 23/28] CLI+lib: detect missing database in split configurations David Bremner
2021-04-07 1:55 ` [PATCH 24/28] lib: provide notmuch_config_path David Bremner
2021-04-07 1:55 ` [PATCH 25/28] CLI/config: support set/get with split configuration David Bremner
2021-04-07 1:55 ` [PATCH 26/28] CLI/config: remove calls to notmuch_config_open from top level David Bremner
2021-04-07 1:55 ` [PATCH 27/28] CLI: drop notmuch_config_t from subcommand interface David Bremner
2021-04-07 1:55 ` [PATCH 28/28] CLI: rename notmuch_config_t to notmuch_conffile_t David Bremner
2021-04-10 12:12 ` v2 convert remaining CLI to new configuration David Bremner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210407015530.2964017-23-david@tethera.net \
--to=david@tethera.net \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).