#include "database-private.h"
#include "parse-time-vrp.h"
+#include "path-util.h"
#if HAVE_XAPIAN_DB_RETRY_LOCK
#define DB_ACTION (Xapian::DB_CREATE_OR_OPEN | Xapian::DB_RETRY_LOCK)
}
static notmuch_status_t
-_load_key_file (const char *path,
+_load_key_file (notmuch_database_t *notmuch,
+ const char *path,
const char *profile,
GKeyFile **key_file)
{
notmuch_status_t status = NOTMUCH_STATUS_SUCCESS;
- void *local = talloc_new (NULL);
if (path && EMPTY_STRING (path))
goto DONE;
if (! path)
path = getenv ("NOTMUCH_CONFIG");
- if (! path) {
- const char *dir = _xdg_dir (local, "XDG_CONFIG_HOME", ".config", profile);
+ if (path)
+ path = talloc_strdup (notmuch, path);
+ else {
+ const char *dir = _xdg_dir (notmuch, "XDG_CONFIG_HOME", ".config", profile);
if (dir) {
- path = talloc_asprintf (local, "%s/config", dir);
+ path = talloc_asprintf (notmuch, "%s/config", dir);
if (access (path, R_OK) != 0)
path = NULL;
}
if (! path) {
const char *home = getenv ("HOME");
- path = talloc_asprintf (local, "%s/.notmuch-config", home);
+ path = talloc_asprintf (notmuch, "%s/.notmuch-config", home);
if (! profile)
profile = getenv ("NOTMUCH_PROFILE");
if (profile)
- path = talloc_asprintf (local, "%s.%s", path, profile);
+ path = talloc_asprintf (notmuch, "%s.%s", path, profile);
}
*key_file = g_key_file_new ();
}
DONE:
- talloc_free (local);
+ if (path)
+ notmuch->config_path = path;
+
return status;
}
static notmuch_status_t
_choose_database_path (void *ctx,
- const char *config_path,
const char *profile,
- GKeyFile **key_file,
+ GKeyFile *key_file,
const char **database_path,
bool *split,
char **message)
{
- notmuch_status_t status;
-
- status = _load_key_file (config_path, profile, key_file);
- if (status) {
- *message = strdup ("Error: cannot load config file.\n");
- return status;
- }
-
if (! *database_path) {
*database_path = getenv ("NOTMUCH_DATABASE");
}
- if (! *database_path && *key_file) {
- char *path = g_key_file_get_value (*key_file, "database", "path", NULL);
+ if (! *database_path && key_file) {
+ char *path = g_key_file_get_value (key_file, "database", "path", NULL);
if (path) {
- *database_path = talloc_strdup (ctx, path);
+ if (path[0] == '/')
+ *database_path = talloc_strdup (ctx, path);
+ else
+ *database_path = talloc_asprintf (ctx, "%s/%s", getenv ("HOME"), path);
g_free (path);
}
}
-
if (! *database_path) {
*database_path = _xdg_dir (ctx, "XDG_DATA_HOME", ".local/share", profile);
*split = true;
}
if (*database_path == NULL) {
- *message = strdup ("Error: Cannot open a database for a NULL path.\n");
- return NOTMUCH_STATUS_NULL_POINTER;
+ *message = strdup ("Error: could not locate database.\n");
+ return NOTMUCH_STATUS_NO_DATABASE;
}
if (*database_path[0] != '/') {
notmuch->exception_reported = false;
notmuch->status_string = NULL;
notmuch->writable_xapian_db = NULL;
+ notmuch->config_path = NULL;
notmuch->atomic_nesting = 0;
notmuch->view = 1;
return notmuch;
if (status != NOTMUCH_STATUS_PATH_ERROR)
goto DONE;
+ if (*message_ptr)
+ free (*message_ptr);
+
notmuch_path = talloc_asprintf (ctx, "%s/.notmuch", database_path);
status = _db_dir_exists (notmuch_path, message_ptr);
if (status)
goto DONE;
}
- if ((status = _choose_database_path (local, config_path, profile,
- &key_file, &database_path, &split,
+ status = _load_key_file (notmuch, config_path, profile, &key_file);
+ if (status) {
+ message = strdup ("Error: cannot load config file.\n");
+ goto DONE;
+ }
+
+ if ((status = _choose_database_path (local, profile, key_file,
+ &database_path, &split,
&message)))
goto DONE;
goto DONE;
}
- _init_libs ();
+ status = _load_key_file (notmuch, config_path, profile, &key_file);
+ if (status) {
+ message = strdup ("Error: cannot load config file.\n");
+ goto DONE;
+ }
- if ((status = _choose_database_path (local, config_path, profile,
- &key_file, &database_path, &split,
- &message)))
+ if ((status = _choose_database_path (local, profile, key_file,
+ &database_path, &split, &message)))
goto DONE;
status = _db_dir_exists (database_path, &message);
_set_database_path (notmuch, database_path);
if (key_file && ! split) {
- char *mail_root = canonicalize_file_name (
+ char *mail_root = notmuch_canonicalize_file_name (
g_key_file_get_value (key_file, "database", "mail_root", NULL));
- char *db_path = canonicalize_file_name (database_path);
+ char *db_path = notmuch_canonicalize_file_name (database_path);
split = (mail_root && (0 != strcmp (mail_root, db_path)));
goto DONE;
}
+ if (message)
+ free (message);
+
status = _finish_open (notmuch,
profile,
NOTMUCH_DATABASE_MODE_READ_WRITE,
notmuch->open = true;
return NOTMUCH_STATUS_SUCCESS;
}
+
+notmuch_status_t
+_maybe_load_config_from_database (notmuch_database_t *notmuch,
+ GKeyFile *key_file,
+ const char *database_path,
+ const char *profile)
+{
+ char *message; /* ignored */
+
+ if (_db_dir_exists (database_path, &message))
+ return NOTMUCH_STATUS_NO_DATABASE;
+
+ _set_database_path (notmuch, database_path);
+
+ if (_notmuch_choose_xapian_path (notmuch, database_path, ¬much->xapian_path, &message))
+ return NOTMUCH_STATUS_NO_DATABASE;
+
+ (void) _finish_open (notmuch, profile, NOTMUCH_DATABASE_MODE_READ_ONLY, key_file, &message);
+
+ return NOTMUCH_STATUS_SUCCESS;
+}
+
+notmuch_status_t
+notmuch_database_load_config (const char *database_path,
+ const char *config_path,
+ const char *profile,
+ notmuch_database_t **database,
+ char **status_string)
+{
+ notmuch_status_t status = NOTMUCH_STATUS_SUCCESS, warning = NOTMUCH_STATUS_SUCCESS;
+ void *local = talloc_new (NULL);
+ notmuch_database_t *notmuch = NULL;
+ char *message = NULL;
+ GKeyFile *key_file = NULL;
+ bool split = false;
+
+ _init_libs ();
+
+ notmuch = _alloc_notmuch ();
+ if (! notmuch) {
+ status = NOTMUCH_STATUS_OUT_OF_MEMORY;
+ goto DONE;
+ }
+
+ status = _load_key_file (notmuch, config_path, profile, &key_file);
+ switch (status) {
+ case NOTMUCH_STATUS_SUCCESS:
+ break;
+ case NOTMUCH_STATUS_NO_CONFIG:
+ warning = status;
+ break;
+ default:
+ message = strdup ("Error: cannot load config file.\n");
+ goto DONE;
+ }
+
+ status = _choose_database_path (local, profile, key_file,
+ &database_path, &split, &message);
+ switch (status) {
+ case NOTMUCH_STATUS_NO_DATABASE:
+ case NOTMUCH_STATUS_SUCCESS:
+ if (! warning)
+ warning = status;
+ break;
+ default:
+ goto DONE;
+ }
+
+
+ if (database_path) {
+ status = _maybe_load_config_from_database (notmuch, key_file, database_path, profile);
+ switch (status) {
+ case NOTMUCH_STATUS_NO_DATABASE:
+ case NOTMUCH_STATUS_SUCCESS:
+ if (! warning)
+ warning = status;
+ break;
+ default:
+ goto DONE;
+ }
+ }
+
+ if (key_file) {
+ status = _notmuch_config_load_from_file (notmuch, key_file);
+ if (status)
+ goto DONE;
+ }
+ status = _notmuch_config_load_defaults (notmuch);
+ if (status)
+ goto DONE;
+
+ DONE:
+ talloc_free (local);
+
+ if (status_string)
+ *status_string = message;
+
+ if (database)
+ *database = notmuch;
+
+ if (status)
+ return status;
+ else
+ return warning;
+}