The main goal is to allow configuration information to be temporarily overridden by a separate config file. --- lib/config.cc | 25 +++++++++++++++++++++++++ lib/database-private.h | 3 +++ lib/database.cc | 4 ++++ lib/notmuch-private.h | 3 +++ 4 files changed, 35 insertions(+)
diff --git a/lib/config.cc b/lib/config.cc index dae0ff0e..2d4c3801 100644 --- a/lib/config.cc +++ b/lib/config.cc @@ -194,3 +194,28 @@ notmuch_config_list_destroy (notmuch_config_list_t *list) { talloc_free (list); } + +notmuch_status_t +_notmuch_config_load_from_database (notmuch_database_t *notmuch) +{ + notmuch_status_t status = NOTMUCH_STATUS_SUCCESS; + notmuch_config_list_t *list; + + if (notmuch->config == NULL) + notmuch->config = _notmuch_string_map_create (notmuch); + + if (unlikely(notmuch->config == NULL)) + return NOTMUCH_STATUS_OUT_OF_MEMORY; + + status = notmuch_database_get_config_list (notmuch, "", &list); + if (status) + return status; + + for (; notmuch_config_list_valid (list); notmuch_config_list_move_to_next (list)) { + _notmuch_string_map_append (notmuch->config, + notmuch_config_list_key (list), + notmuch_config_list_value (list)); + } + + return status; +} diff --git a/lib/database-private.h b/lib/database-private.h index 041602cd..bfeef869 100644 --- a/lib/database-private.h +++ b/lib/database-private.h @@ -226,6 +226,9 @@ struct _notmuch_database { * here, but at least they are small */ notmuch_string_map_t *user_prefix; notmuch_string_map_t *user_header; + + /* Cached and possibly overridden configuration */ + notmuch_string_map_t *config; }; /* Prior to database version 3, features were implied by the database diff --git a/lib/database.cc b/lib/database.cc index acc686c0..350abb11 100644 --- a/lib/database.cc +++ b/lib/database.cc @@ -987,6 +987,7 @@ notmuch_database_open_with_config (const char *database_path, notmuch = talloc_zero (NULL, notmuch_database_t); notmuch->exception_reported = false; notmuch->status_string = NULL; + notmuch->config = NULL; notmuch->path = talloc_strdup (notmuch, database_path); strip_trailing (notmuch->path, '/'); @@ -1085,6 +1086,9 @@ notmuch_database_open_with_config (const char *database_path, } } status = _setup_user_query_fields (notmuch); + + if (status == NOTMUCH_STATUS_SUCCESS) + status = _notmuch_config_load_from_database (notmuch); } catch (const Xapian::Error &error) { IGNORE_RESULT (asprintf (&message, "A Xapian exception occurred opening database: %s\n", error.get_msg ().c_str ())); diff --git a/lib/notmuch-private.h b/lib/notmuch-private.h index 57ec7f72..0f26b371 100644 --- a/lib/notmuch-private.h +++ b/lib/notmuch-private.h @@ -699,6 +699,9 @@ struct _notmuch_indexopts { #define EMPTY_STRING(s) ((s)[0] == '\0') +/* config.cc */ +notmuch_status_t +_notmuch_config_load_from_database (notmuch_database_t * db); NOTMUCH_END_DECLS #ifdef __cplusplus -- 2.28.0 _______________________________________________ notmuch mailing list -- notmuch@notmuchmail.org To unsubscribe send an email to notmuch-le...@notmuchmail.org