debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-25 12:28:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

lib/open: use notmuch->params to track split status

Browse source 
Persisting this status will allow us to use the information in other
compilation units, in particular when setting configuration defaults.
This commit is contained in:
David Bremner 2021-12-25 09:33:03 -04:00
parent fd0edeb561
commit 63b4c46983
2 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/database-private.h
View file

@ -191,12 +191,17 @@ operator& (notmuch_field_flag_t a, notmuch_field_flag_t b)
Xapian::QueryParser::FLAG_PURE_NOT) Xapian::QueryParser::FLAG_PURE_NOT)
/* /*
* Which parameters were explicit when the database was opened */ * explicit and implied parameters to open */
typedef enum { typedef enum {
NOTMUCH_PARAM_NONE = 0, NOTMUCH_PARAM_NONE = 0,
/* database passed explicitely */
NOTMUCH_PARAM_DATABASE = 1 << 0, NOTMUCH_PARAM_DATABASE = 1 << 0,
/* config file passed explicitely */
NOTMUCH_PARAM_CONFIG = 1 << 1, NOTMUCH_PARAM_CONFIG = 1 << 1,
/* profile name passed explicitely */
NOTMUCH_PARAM_PROFILE = 1 << 2, NOTMUCH_PARAM_PROFILE = 1 << 2,
/* split (e.g. XDG) configuration */
NOTMUCH_PARAM_SPLIT = 1 << 3,
} notmuch_open_param_t; } notmuch_open_param_t;
/* /*

19
lib/open.cc
View file

@ -190,7 +190,6 @@ _choose_database_path (notmuch_database_t *notmuch,
const char *profile, const char *profile,
GKeyFile *key_file, GKeyFile *key_file,
const char **database_path, const char **database_path,
bool *split,
char **message) char **message)
{ {
if (! *database_path) { if (! *database_path) {
@ -215,7 +214,7 @@ _choose_database_path (notmuch_database_t *notmuch,
if (status) { if (status) {
*database_path = NULL; *database_path = NULL;
} else { } else {
*split = true; notmuch->params |= NOTMUCH_PARAM_SPLIT;
} }
} }
@ -513,7 +512,6 @@ notmuch_database_open_with_config (const char *database_path,
notmuch_database_t *notmuch = NULL; notmuch_database_t *notmuch = NULL;
char *message = NULL; char *message = NULL;
GKeyFile *key_file = NULL; GKeyFile *key_file = NULL;
bool split = false;
_notmuch_init (); _notmuch_init ();
@ -530,7 +528,7 @@ notmuch_database_open_with_config (const char *database_path,
} }
if ((status = _choose_database_path (notmuch, profile, key_file, if ((status = _choose_database_path (notmuch, profile, key_file,
&database_path, &split, &database_path,
&message))) &message)))
goto DONE; goto DONE;
@ -610,7 +608,6 @@ notmuch_database_create_with_config (const char *database_path,
char *message = NULL; char *message = NULL;
GKeyFile *key_file = NULL; GKeyFile *key_file = NULL;
int err; int err;
bool split = false;
_notmuch_init (); _notmuch_init ();
@ -627,7 +624,7 @@ notmuch_database_create_with_config (const char *database_path,
} }
if ((status = _choose_database_path (notmuch, profile, key_file, if ((status = _choose_database_path (notmuch, profile, key_file,
&database_path, &split, &message))) &database_path, &message)))
goto DONE; goto DONE;
status = _db_dir_exists (database_path, &message); status = _db_dir_exists (database_path, &message);
@ -636,18 +633,19 @@ notmuch_database_create_with_config (const char *database_path,
_set_database_path (notmuch, database_path); _set_database_path (notmuch, database_path);
if (key_file && ! split) { if (key_file && ! (notmuch->params & NOTMUCH_PARAM_SPLIT)) {
char *mail_root = notmuch_canonicalize_file_name ( char *mail_root = notmuch_canonicalize_file_name (
g_key_file_get_string (key_file, "database", "mail_root", NULL)); g_key_file_get_string (key_file, "database", "mail_root", NULL));
char *db_path = notmuch_canonicalize_file_name (database_path); char *db_path = notmuch_canonicalize_file_name (database_path);
split = (mail_root && (0 != strcmp (mail_root, db_path))); if (mail_root && (0 != strcmp (mail_root, db_path)))
notmuch->params |= NOTMUCH_PARAM_SPLIT;
free (mail_root); free (mail_root);
free (db_path); free (db_path);
} }
if (split) { if (notmuch->params & NOTMUCH_PARAM_SPLIT) {
notmuch_path = database_path; notmuch_path = database_path;
} else { } else {
if (! (notmuch_path = talloc_asprintf (notmuch, "%s/%s", database_path, ".notmuch"))) { if (! (notmuch_path = talloc_asprintf (notmuch, "%s/%s", database_path, ".notmuch"))) {
@ -805,7 +803,6 @@ notmuch_database_load_config (const char *database_path,
notmuch_database_t *notmuch = NULL; notmuch_database_t *notmuch = NULL;
char *message = NULL; char *message = NULL;
GKeyFile *key_file = NULL; GKeyFile *key_file = NULL;
bool split = false;
_notmuch_init (); _notmuch_init ();
@ -828,7 +825,7 @@ notmuch_database_load_config (const char *database_path,
} }
status = _choose_database_path (notmuch, profile, key_file, status = _choose_database_path (notmuch, profile, key_file,
&database_path, &split, &message); &database_path, &message);
switch (status) { switch (status) {
case NOTMUCH_STATUS_NO_DATABASE: case NOTMUCH_STATUS_NO_DATABASE:
case NOTMUCH_STATUS_SUCCESS: case NOTMUCH_STATUS_SUCCESS: