lib: add NOTMUCH_STATUS_NO_CONFIG

[notmuch] / lib / open.cc

diff --git a/lib/open.cc b/lib/open.cc
index 7acaea7bf3502abd685fb708af63bb5863729f5a..06d079e4c589a9e084b0c1724ce13361722a505c 100644 (file)
--- a/lib/open.cc
+++ b/lib/open.cc
@@ -37,6 +37,113 @@ notmuch_database_open_verbose (const char *path,
                                              database, status_string);
 }
 
+static const char *
+_xdg_dir (void *ctx,
+         const char *xdg_root_variable,
+         const char *xdg_prefix,
+         const char *profile_name)
+{
+    const char *xdg_root = getenv (xdg_root_variable);
+
+    if (! xdg_root) {
+       const char *home = getenv ("HOME");
+
+       if (! home) return NULL;
+
+       xdg_root = talloc_asprintf (ctx,
+                                   "%s/%s",
+                                   home,
+                                   xdg_prefix);
+    }
+
+    if (! profile_name)
+       profile_name = getenv ("NOTMUCH_PROFILE");
+
+    if (! profile_name)
+       profile_name = "default";
+
+    return talloc_asprintf (ctx,
+                           "%s/notmuch/%s",
+                           xdg_root,
+                           profile_name);
+}
+
+static notmuch_status_t
+_load_key_file (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 (dir) {
+           path = talloc_asprintf (local, "%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);
+
+       if (! profile)
+           profile = getenv ("NOTMUCH_PROFILE");
+
+       if (profile)
+           path = talloc_asprintf (local, "%s.%s", path, profile);
+    }
+
+    *key_file = g_key_file_new ();
+    if (! g_key_file_load_from_file (*key_file, path, G_KEY_FILE_NONE, NULL)) {
+       status = NOTMUCH_STATUS_NO_CONFIG;
+    }
+
+DONE:
+    talloc_free (local);
+    return status;
+}
+
+static notmuch_status_t
+_choose_database_path (const char *config_path,
+                      const char *profile,
+                      GKeyFile **key_file,
+                      const char **database_path,
+                      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 && *key_file)
+       *database_path = g_key_file_get_value (*key_file, "database", "path", NULL);
+
+    if (*database_path == NULL) {
+       *message = strdup ("Error: Cannot open a database for a NULL path.\n");
+       return NOTMUCH_STATUS_NULL_POINTER;
+    }
+
+    if (*database_path[0] != '/') {
+       *message = strdup ("Error: Database path must be absolute.\n");
+       return NOTMUCH_STATUS_PATH_ERROR;
+    }
+    return NOTMUCH_STATUS_SUCCESS;
+}
+
 notmuch_status_t
 notmuch_database_open_with_config (const char *database_path,
                                   notmuch_database_mode_t mode,
@@ -49,7 +156,6 @@ notmuch_database_open_with_config (const char *database_path,
     void *local = talloc_new (NULL);
     notmuch_database_t *notmuch = NULL;
     char *notmuch_path, *xapian_path, *incompat_features;
-    char *configured_database_path = NULL;
     char *message = NULL;
     struct stat st;
     int err;
@@ -57,30 +163,8 @@ notmuch_database_open_with_config (const char *database_path,
     GKeyFile *key_file = NULL;
     static int initialized = 0;
 
-    /* XXX TODO: default locations for NULL case, handle profiles */
-    if (config_path != NULL && ! EMPTY_STRING (config_path)) {
-       key_file = g_key_file_new ();
-       if (! g_key_file_load_from_file (key_file, config_path, G_KEY_FILE_NONE, NULL)) {
-           status = NOTMUCH_STATUS_FILE_ERROR;
-           goto DONE;
-       }
-       configured_database_path = g_key_file_get_value (key_file, "database", "path", NULL);
-    }
-
-    if (database_path == NULL)
-       database_path = configured_database_path;
-
-    if (database_path == NULL) {
-       message = strdup ("Error: Cannot open a database for a NULL path.\n");
-       status = NOTMUCH_STATUS_NULL_POINTER;
+    if ((status = _choose_database_path (config_path, profile, &key_file, &database_path, &message)))
        goto DONE;
-    }
-
-    if (database_path[0] != '/') {
-       message = strdup ("Error: Database path must be absolute.\n");
-       status = NOTMUCH_STATUS_PATH_ERROR;
-       goto DONE;
-    }
 
     if (! (notmuch_path = talloc_asprintf (local, "%s/%s", database_path, ".notmuch"))) {
        message = strdup ("Out of memory\n");
@@ -217,6 +301,10 @@ notmuch_database_open_with_config (const char *database_path,
        if (status)
            goto DONE;
 
+       status = _notmuch_config_load_defaults (notmuch);
+       if (status)
+           goto DONE;
+
        status = _notmuch_database_setup_standard_query_fields (notmuch);
        if (status)
            goto DONE;