In a split configuration, it does not make sense to have the extra
.notmuch/ directory. Leave the xapian/ level of the path to allow the
use of the top level e.g. as a place to store backups as is currently
done by upgrade code in notmuch-new.
---
lib/open.cc | 71 +++++++++++++++++++++++++++-----------
test/T030-config.sh | 2 +-
test/T055-path-config.sh | 5 ++-
test/T360-symbol-hiding.sh | 2 +-
test/T750-user-header.sh | 2 +-
5 files changed, 57 insertions(+), 25 deletions(-)
diff --git a/lib/open.cc b/lib/open.cc
index b5a56e73..887bc44d 100644
--- a/lib/open.cc
+++ b/lib/open.cc
@@ -223,6 +223,54 @@ notmuch_database_t * _alloc_notmuch() {
return notmuch;
}
+static notmuch_status_t
+_trial_open (const char *xapian_path, char **message_ptr)
+{
+ try {
+ Xapian::Database db(xapian_path);
+ } catch (const Xapian::DatabaseOpeningError &error) {
+ IGNORE_RESULT (asprintf (message_ptr,
+ "Cannot open Xapian database at %s: %s\n",
+ xapian_path,
+ error.get_msg ().c_str ()));
+ return NOTMUCH_STATUS_PATH_ERROR;
+ } catch (const Xapian::Error &error) {
+ IGNORE_RESULT (asprintf (message_ptr,
+ "A Xapian exception occurred opening database: %s\n",
+ error.get_msg ().c_str ()));
+ return NOTMUCH_STATUS_XAPIAN_EXCEPTION;
+ }
+ return NOTMUCH_STATUS_SUCCESS;
+}
+
+static notmuch_status_t
+_choose_xapian_path (void *ctx, const char *database_path, const char **xapian_path, char **message_ptr){
+ notmuch_status_t status;
+ const char *trial_path, *notmuch_path;
+
+ status = _db_dir_exists (database_path, message_ptr);
+ if (status)
+ goto DONE;
+
+ trial_path = talloc_asprintf (ctx, "%s/xapian", database_path);
+ status = _trial_open (trial_path, message_ptr);
+ if (status != NOTMUCH_STATUS_PATH_ERROR)
+ goto DONE;
+
+ notmuch_path = talloc_asprintf (ctx, "%s/.notmuch", database_path);
+ status = _db_dir_exists (notmuch_path, message_ptr);
+ if (status)
+ goto DONE;
+
+ trial_path = talloc_asprintf (ctx, "%s/xapian", notmuch_path);
+ status = _trial_open (trial_path, message_ptr);
+
+ DONE:
+ if (status == NOTMUCH_STATUS_SUCCESS)
+ *xapian_path = trial_path;
+ return status;
+}
+
static void _init_libs () {
static int initialized = 0;
@@ -385,10 +433,7 @@ notmuch_database_open_with_config (const char *database_path,
notmuch_status_t status = NOTMUCH_STATUS_SUCCESS;
void *local = talloc_new (NULL);
notmuch_database_t *notmuch = NULL;
- char *notmuch_path;
char *message = NULL;
- struct stat st;
- int err;
GKeyFile *key_file = NULL;
_init_libs ();
@@ -409,24 +454,9 @@ notmuch_database_open_with_config (const char *database_path,
notmuch->path = talloc_strdup (notmuch, database_path);
strip_trailing (notmuch->path, '/');
- if (! (notmuch_path = talloc_asprintf (local, "%s/%s", database_path, ".notmuch"))) {
- message = strdup ("Out of memory\n");
- status = NOTMUCH_STATUS_OUT_OF_MEMORY;
- goto DONE;
- }
-
- err = stat (notmuch_path, &st);
- if (err) {
- IGNORE_RESULT (asprintf (&message, "Error opening database at %s: %s\n",
- notmuch_path, strerror (errno)));
- status = NOTMUCH_STATUS_FILE_ERROR;
- goto DONE;
- }
-
- if (! (notmuch->xapian_path = talloc_asprintf (notmuch, "%s/%s", notmuch_path, "xapian"))) {
- status = NOTMUCH_STATUS_OUT_OF_MEMORY;
+ status = _choose_xapian_path (local, database_path, ¬much->xapian_path, &message);
+ if (status)
goto DONE;
- }
status = _finish_open (notmuch, profile, mode, key_file, &message);
@@ -486,7 +516,6 @@ notmuch_database_create_with_config (const char *database_path,
notmuch_status_t status = NOTMUCH_STATUS_SUCCESS;
notmuch_database_t *notmuch = NULL;
char *notmuch_path = NULL;
- char *xapian_path = NULL;
char *message = NULL;
GKeyFile *key_file = NULL;
void *local = talloc_new (NULL);
diff --git a/test/T030-config.sh b/test/T030-config.sh
index 883541d5..67c9545c 100755
--- a/test/T030-config.sh
+++ b/test/T030-config.sh
@@ -61,7 +61,7 @@ built_with.compact=something
built_with.field_processor=something
built_with.retry_lock=something
====
-Error opening database at MAIL_DIR/.notmuch: No such file or directory
+Error: Cannot open database at MAIL_DIR/.notmuch: No such file or directory.
EOF
test_expect_equal_file EXPECTED OUTPUT
diff --git a/test/T055-path-config.sh b/test/T055-path-config.sh
index 1da0e9fe..59b12337 100755
--- a/test/T055-path-config.sh
+++ b/test/T055-path-config.sh
@@ -28,7 +28,6 @@ split_config () {
}
-
for config in traditional split+prefix; do
# start each set of tests with a known set of messages
add_email_corpus
@@ -41,6 +40,10 @@ for config in traditional split+prefix; do
split_config
mv mail/.notmuch $DATABASE_PATH
;;
+ split)
+ split_config
+ mv mail/.notmuch/xapian $DATABASE_PATH
+ ;;
esac
test_begin_subtest "count ($config)"
diff --git a/test/T360-symbol-hiding.sh b/test/T360-symbol-hiding.sh
index 729b9d72..642457bf 100755
--- a/test/T360-symbol-hiding.sh
+++ b/test/T360-symbol-hiding.sh
@@ -17,7 +17,7 @@ $TEST_DIRECTORY/symbol-test ${PWD}/fakedb ${PWD}/nonexistent 2>&1 \
| notmuch_dir_sanitize | sed -e "s,\`,\',g" -e "s,No [^[:space:]]* database,No XXXXXX database,g" > OUTPUT
cat <<EOF > EXPECTED
-A Xapian exception occurred opening database: Couldn't stat 'CWD/fakedb/.notmuch/xapian'
+Cannot open Xapian database at CWD/fakedb/.notmuch/xapian: Couldn't stat 'CWD/fakedb/.notmuch/xapian'
caught No XXXXXX database found at path 'CWD/nonexistent'
EOF
test_expect_equal_file EXPECTED OUTPUT
diff --git a/test/T750-user-header.sh b/test/T750-user-header.sh
index ff554b06..b19db571 100755
--- a/test/T750-user-header.sh
+++ b/test/T750-user-header.sh
@@ -5,7 +5,7 @@ test_description='indexing user specified headers'
test_begin_subtest "error adding user header before initializing DB"
notmuch config set index.header.List List-Id 2>&1 | notmuch_dir_sanitize > OUTPUT
cat <<EOF > EXPECTED
-Error opening database at MAIL_DIR/.notmuch: No such file or directory
+Error: Cannot open database at MAIL_DIR/.notmuch: No such file or directory.
EOF
test_expect_equal_file EXPECTED OUTPUT
--
2.30.0
_______________________________________________
notmuch mailing list -- notmuch@notmuchmail.org
To unsubscribe send an email to notmuch-leave@notmuchmail.org