From: David Bremner <david@tethera.net>
To: David Bremner <david@tethera.net>, notmuch@notmuchmail.org
Subject: [PATCH 2/9] cli/config: refactor _stored_in_db
Date: Sun, 28 Apr 2019 20:10:42 -0300 [thread overview]
Message-ID: <20190428231049.15737-3-david@tethera.net> (raw)
In-Reply-To: <20190428231049.15737-1-david@tethera.net>
This will make it easier to add other prefixes that are stored in the
database, compared to special casing each one as "query." was.
---
notmuch-config.c | 47 +++++++++++++++++++++++++++++++++++++----------
1 file changed, 37 insertions(+), 10 deletions(-)
diff --git a/notmuch-config.c b/notmuch-config.c
index bf77cc9d..daecbdac 100644
--- a/notmuch-config.c
+++ b/notmuch-config.c
@@ -821,18 +821,40 @@ _item_split (char *item, char **group, char **key)
#define BUILT_WITH_PREFIX "built_with."
+typedef struct config_key {
+ const char *name;
+ bool in_db;
+ bool prefix;
+ bool (*validate)(const char *);
+} config_key_info_t;
+
+static struct config_key
+config_key_table[] = {
+ {"index.decrypt", true, false, NULL},
+ {"query.", true, true, NULL},
+};
+
+static config_key_info_t *
+_config_key_info (const char *item)
+{
+ for (size_t i = 0; i < ARRAY_SIZE (config_key_table); i++) {
+ if (config_key_table[i].prefix &&
+ strncmp (item, config_key_table[i].name,
+ strlen(config_key_table[i].name)) == 0)
+ return config_key_table+i;
+ if (strcmp (item, config_key_table[i].name) == 0)
+ return config_key_table+i;
+ }
+ return NULL;
+}
+
static bool
_stored_in_db (const char *item)
{
- const char * db_configs[] = {
- "index.decrypt",
- };
- if (STRNCMP_LITERAL (item, "query.") == 0)
- return true;
- for (size_t i = 0; i < ARRAY_SIZE (db_configs); i++)
- if (strcmp (item, db_configs[i]) == 0)
- return true;
- return false;
+ config_key_info_t *info;
+ info = _config_key_info (item);
+
+ return (info && info->in_db);
}
static int
@@ -947,13 +969,18 @@ static int
notmuch_config_command_set (notmuch_config_t *config, char *item, int argc, char *argv[])
{
char *group, *key;
+ config_key_info_t *key_info;
if (STRNCMP_LITERAL (item, BUILT_WITH_PREFIX) == 0) {
fprintf (stderr, "Error: read only option: %s\n", item);
return 1;
}
- if (_stored_in_db (item)) {
+ key_info = _config_key_info (item);
+ if (key_info && key_info->validate && (! key_info->validate (item)))
+ return 1;
+
+ if (key_info && key_info->in_db) {
return _set_db_config (config, item, argc, argv);
}
--
2.20.1
next prev parent reply other threads:[~2019-04-28 23:11 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-27 11:16 Index user defined headers David Bremner
2019-03-27 11:16 ` [PATCH 1/9] util: add unicode_word_utf8 David Bremner
2019-03-27 11:16 ` [PATCH 2/9] cli/config: refactor _stored_in_db David Bremner
2019-03-27 11:16 ` [PATCH 3/9] cli/config: support user header index config David Bremner
2019-03-27 11:16 ` [PATCH 4/9] cli/config: check syntax of user configured field names David Bremner
2019-03-27 11:16 ` [PATCH 5/9] lib: setup user headers in query parser David Bremner
2019-03-27 11:16 ` [PATCH 6/9] lib: cache user prefixes in database object David Bremner
2019-03-27 11:16 ` [PATCH 7/9] lib: support user prefix names in term generation David Bremner
2019-03-27 11:16 ` [PATCH 8/9] lib/database: index user headers David Bremner
2019-03-27 11:16 ` [PATCH 9/9] doc: document user header indexing David Bremner
2019-04-26 11:15 ` Index user defined headers David Bremner
2019-05-25 10:38 ` David Bremner
2019-04-28 23:10 ` Index user defined headers v2 David Bremner
2019-04-28 23:10 ` [PATCH 1/9] util: add unicode_word_utf8 David Bremner
2019-04-28 23:10 ` David Bremner [this message]
2019-04-28 23:10 ` [PATCH 3/9] cli/config: support user header index config David Bremner
2019-04-28 23:10 ` [PATCH 4/9] cli/config: check syntax of user configured field names David Bremner
2019-04-28 23:10 ` [PATCH 5/9] lib: setup user headers in query parser David Bremner
2019-04-28 23:10 ` [PATCH 6/9] lib: cache user prefixes in database object David Bremner
2019-04-28 23:10 ` [PATCH 7/9] lib: support user prefix names in term generation David Bremner
2019-04-28 23:10 ` [PATCH 8/9] lib/database: index user headers David Bremner
2019-04-28 23:10 ` [PATCH 9/9] doc: document user header indexing 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=20190428231049.15737-3-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).