X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=lib%2Fopen.cc;h=1ca69665c4e446ce4023b90713a86376c91310ee;hb=c84ccb70f3ed2b2228346499b5110311039a0ecf;hp=6c3ef46fe5a620d9f00ffffd2947858e33efab51;hpb=2fc40e24de4fb06428273e6f55ebd72faabde778;p=notmuch diff --git a/lib/open.cc b/lib/open.cc index 6c3ef46f..1ca69665 100644 --- a/lib/open.cc +++ b/lib/open.cc @@ -3,6 +3,7 @@ #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) @@ -113,12 +114,12 @@ _choose_dir (notmuch_database_t *notmuch, } 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; @@ -126,11 +127,13 @@ _load_key_file (const char *path, 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; } @@ -139,13 +142,13 @@ _load_key_file (const char *path, 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 (); @@ -154,7 +157,9 @@ _load_key_file (const char *path, } DONE: - talloc_free (local); + if (path) + notmuch->config_path = path; + return status; } @@ -196,19 +201,38 @@ _choose_database_path (void *ctx, 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) { + notmuch_status_t status; + *database_path = _xdg_dir (ctx, "XDG_DATA_HOME", ".local/share", profile); - *split = true; + status = _db_dir_exists (*database_path, message); + if (status) { + *database_path = NULL; + } else { + *split = true; + } + } + + if (! *database_path) { + notmuch_status_t status; + + *database_path = talloc_asprintf (ctx, "%s/mail", getenv ("HOME")); + status = _db_dir_exists (*database_path, message); + if (status) { + *database_path = NULL; + } } 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] != '/') { @@ -230,6 +254,7 @@ _alloc_notmuch () 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; @@ -300,21 +325,34 @@ _set_database_path (notmuch_database_t *notmuch, } static void -_init_libs () +_load_database_state (notmuch_database_t *notmuch) { + std::string last_thread_id; + std::string last_mod; - static int initialized = 0; - - /* Initialize the GLib type system and threads */ -#if ! GLIB_CHECK_VERSION (2, 35, 1) - g_type_init (); -#endif + notmuch->last_doc_id = notmuch->xapian_db->get_lastdocid (); + last_thread_id = notmuch->xapian_db->get_metadata ("last_thread_id"); + if (last_thread_id.empty ()) { + notmuch->last_thread_id = 0; + } else { + const char *str; + char *end; - /* Initialize gmime */ - if (! initialized) { - g_mime_init (); - initialized = 1; + str = last_thread_id.c_str (); + notmuch->last_thread_id = strtoull (str, &end, 16); + if (*end != '\0') + INTERNAL_ERROR ("Malformed database last_thread_id: %s", str); } + + /* Get current highest revision number. */ + last_mod = notmuch->xapian_db->get_value_upper_bound ( + NOTMUCH_VALUE_LAST_MOD); + if (last_mod.empty ()) + notmuch->revision = 0; + else + notmuch->revision = Xapian::sortable_unserialise (last_mod); + notmuch->uuid = talloc_strdup ( + notmuch, notmuch->xapian_db->get_uuid ().c_str ()); } static notmuch_status_t @@ -331,8 +369,6 @@ _finish_open (notmuch_database_t *notmuch, const char *database_path = notmuch_database_get_path (notmuch); try { - std::string last_thread_id; - std::string last_mod; if (mode == NOTMUCH_DATABASE_MODE_READ_WRITE) { notmuch->writable_xapian_db = new Xapian::WritableDatabase (notmuch->xapian_path, @@ -376,29 +412,7 @@ _finish_open (notmuch_database_t *notmuch, goto DONE; } - notmuch->last_doc_id = notmuch->xapian_db->get_lastdocid (); - last_thread_id = notmuch->xapian_db->get_metadata ("last_thread_id"); - if (last_thread_id.empty ()) { - notmuch->last_thread_id = 0; - } else { - const char *str; - char *end; - - str = last_thread_id.c_str (); - notmuch->last_thread_id = strtoull (str, &end, 16); - if (*end != '\0') - INTERNAL_ERROR ("Malformed database last_thread_id: %s", str); - } - - /* Get current highest revision number. */ - last_mod = notmuch->xapian_db->get_value_upper_bound ( - NOTMUCH_VALUE_LAST_MOD); - if (last_mod.empty ()) - notmuch->revision = 0; - else - notmuch->revision = Xapian::sortable_unserialise (last_mod); - notmuch->uuid = talloc_strdup ( - notmuch, notmuch->xapian_db->get_uuid ().c_str ()); + _load_database_state (notmuch); notmuch->query_parser = new Xapian::QueryParser; notmuch->term_gen = new Xapian::TermGenerator; @@ -483,7 +497,7 @@ notmuch_database_open_with_config (const char *database_path, GKeyFile *key_file = NULL; bool split = false; - _init_libs (); + _notmuch_init (); notmuch = _alloc_notmuch (); if (! notmuch) { @@ -491,7 +505,7 @@ notmuch_database_open_with_config (const char *database_path, goto DONE; } - status = _load_key_file (config_path, profile, &key_file); + status = _load_key_file (notmuch, config_path, profile, &key_file); if (status) { message = strdup ("Error: cannot load config file.\n"); goto DONE; @@ -580,7 +594,7 @@ notmuch_database_create_with_config (const char *database_path, int err; bool split = false; - _init_libs (); + _notmuch_init (); notmuch = _alloc_notmuch (); if (! notmuch) { @@ -588,7 +602,7 @@ notmuch_database_create_with_config (const char *database_path, goto DONE; } - status = _load_key_file (config_path, profile, &key_file); + status = _load_key_file (notmuch, config_path, profile, &key_file); if (status) { message = strdup ("Error: cannot load config file.\n"); goto DONE; @@ -605,9 +619,9 @@ notmuch_database_create_with_config (const char *database_path, _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))); @@ -725,6 +739,8 @@ notmuch_database_reopen (notmuch_database_t *notmuch, DB_ACTION); } } + + _load_database_state (notmuch); } catch (const Xapian::Error &error) { if (! notmuch->exception_reported) { _notmuch_database_log (notmuch, "Error: A Xapian exception reopening database: %s\n", @@ -748,12 +764,12 @@ _maybe_load_config_from_database (notmuch_database_t *notmuch, char *message; /* ignored */ if (_db_dir_exists (database_path, &message)) - return NOTMUCH_STATUS_SUCCESS; + 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_SUCCESS; + return NOTMUCH_STATUS_NO_DATABASE; (void) _finish_open (notmuch, profile, NOTMUCH_DATABASE_MODE_READ_ONLY, key_file, &message); @@ -774,7 +790,7 @@ notmuch_database_load_config (const char *database_path, GKeyFile *key_file = NULL; bool split = false; - _init_libs (); + _notmuch_init (); notmuch = _alloc_notmuch (); if (! notmuch) { @@ -782,9 +798,10 @@ notmuch_database_load_config (const char *database_path, goto DONE; } - status = _load_key_file (config_path, profile, &key_file); + 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; @@ -796,19 +813,27 @@ notmuch_database_load_config (const char *database_path, status = _choose_database_path (local, profile, key_file, &database_path, &split, &message); switch (status) { - /* weirdly NULL_POINTER is what is returned if we fail to find - * a database */ - case NOTMUCH_STATUS_NULL_POINTER: + 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); - if (status) + switch (status) { + case NOTMUCH_STATUS_NO_DATABASE: + case NOTMUCH_STATUS_SUCCESS: + if (! warning) + warning = status; + break; + default: goto DONE; + } } if (key_file) {