unofficial mirror of notmuch@notmuchmail.org
 help / color / mirror / code / Atom feed
From: David Bremner <david@tethera.net>
To: notmuch@notmuchmail.org
Cc: David Bremner <david@tethera.net>
Subject: [PATCH 14/21] lib/open: check for split configuration when creating database.
Date: Wed, 17 Feb 2021 16:10:38 -0400	[thread overview]
Message-ID: <20210217201045.2021106-15-david@tethera.net> (raw)
In-Reply-To: <20210217201045.2021106-1-david@tethera.net>

This will be tested when notmuch-new is converted to support split
configuration.
---
 lib/open.cc              | 53 ++++++++++++++++++++++++++++++----------
 test/T055-path-config.sh | 15 ++++++++++--
 2 files changed, 53 insertions(+), 15 deletions(-)

diff --git a/lib/open.cc b/lib/open.cc
index 2f65198d..0b3b9ca4 100644
--- a/lib/open.cc
+++ b/lib/open.cc
@@ -525,11 +525,12 @@ 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;
+    const char *notmuch_path = NULL;
     char *message = NULL;
     GKeyFile *key_file = NULL;
     void *local = talloc_new (NULL);
     int err;
+    bool split = false;
 
     _init_libs ();
 
@@ -548,20 +549,38 @@ notmuch_database_create_with_config (const char *database_path,
 
     _set_database_path (notmuch, database_path);
 
-    notmuch_path = talloc_asprintf (local, "%s/%s", database_path, ".notmuch");
+    if (key_file && !split) {
+	char *mail_root = canonicalize_file_name (
+	    g_key_file_get_value (key_file, "database", "mail_root", NULL));
+	char *db_path = canonicalize_file_name (database_path);
 
-    err = mkdir (notmuch_path, 0755);
-    if (err) {
-	if (errno == EEXIST) {
-	    status = NOTMUCH_STATUS_DATABASE_EXISTS;
-	    talloc_free (notmuch);
-	    notmuch = NULL;
-	} else {
-	    IGNORE_RESULT (asprintf (&message, "Error: Cannot create directory %s: %s.\n",
-				     notmuch_path, strerror (errno)));
-	    status = NOTMUCH_STATUS_FILE_ERROR;
+	split = (mail_root && (0 != strcmp (mail_root, db_path)));
+
+	free(mail_root);
+	free (db_path);
+    }
+
+    if (split) {
+	notmuch_path = database_path;
+    } else {
+	if (! (notmuch_path = talloc_asprintf (local, "%s/%s", database_path, ".notmuch"))) {
+	    status = NOTMUCH_STATUS_OUT_OF_MEMORY;
+	    goto DONE;
+	}
+
+	err = mkdir (notmuch_path, 0755);
+	if (err) {
+	    if (errno == EEXIST) {
+		status = NOTMUCH_STATUS_DATABASE_EXISTS;
+		talloc_free (notmuch);
+		notmuch = NULL;
+	    } else {
+		IGNORE_RESULT (asprintf (&message, "Error: Cannot create directory %s: %s.\n",
+					 notmuch_path, strerror (errno)));
+		status = NOTMUCH_STATUS_FILE_ERROR;
+	    }
+	    goto DONE;
 	}
-	goto DONE;
     }
 
     if (! (notmuch->xapian_path = talloc_asprintf (notmuch, "%s/%s", notmuch_path, "xapian"))) {
@@ -569,6 +588,14 @@ notmuch_database_create_with_config (const char *database_path,
 	goto DONE;
     }
 
+    status = _trial_open (notmuch->xapian_path, &message);
+    if (status == NOTMUCH_STATUS_SUCCESS) {
+	notmuch_database_destroy (notmuch);
+	notmuch = NULL;
+	status = NOTMUCH_STATUS_DATABASE_EXISTS;
+	goto DONE;
+    }
+
     status = _finish_open (notmuch,
 			   profile,
 			   NOTMUCH_DATABASE_MODE_READ_WRITE,
diff --git a/test/T055-path-config.sh b/test/T055-path-config.sh
index c6920ca9..19a8a4ab 100755
--- a/test/T055-path-config.sh
+++ b/test/T055-path-config.sh
@@ -27,9 +27,17 @@ split_config () {
     DATABASE_PATH=$dir
 }
 
+symlink_config () {
+    local dir
+    backup_config
+    dir="$TMP_DIRECTORY/link.$test_count"
+    ln -s $MAIL_DIR $dir
+    notmuch config set database.path $dir
+    notmuch config set database.mail_root $MAIL_DIR
+    unset DATABASE_PATH
+}
 
-
-for config in traditional split; do
+for config in traditional split symlink; do
     # start each set of tests with a known set of messages
     add_email_corpus
 
@@ -41,6 +49,9 @@ for config in traditional split; do
 	    split_config
 	    mv mail/.notmuch/xapian $DATABASE_PATH
 	    ;;
+	symlink)
+	    symlink_config
+	    ;;
     esac
 
     test_begin_subtest "count ($config)"
-- 
2.30.0

  parent reply	other threads:[~2021-02-17 20:12 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-17 20:10 v2 flexible database location David Bremner
2021-02-17 20:10 ` [PATCH 01/21] lib: publish API for notmuch_database_reopen David Bremner
2021-02-17 20:10 ` [PATCH 02/21] lib: save path of xapian database in notmuch struct David Bremner
2021-02-17 20:10 ` [PATCH 03/21] lib: support reopening databases for write access David Bremner
2021-02-17 20:10 ` [PATCH 04/21] CLI/show: complete conversion to new configuration framework David Bremner
2021-02-17 20:10 ` [PATCH 05/21] lib/open: support NOTMUCH_DATABASE environment variable David Bremner
2021-02-17 20:10 ` [PATCH 06/21] lib/open: allocate notmuch_t struct early David Bremner
2021-02-17 20:10 ` [PATCH 07/21] lib: remove "path" from notmuch struct David Bremner
2021-02-17 20:10 ` [PATCH 08/21] lib/open: factor out library initialization David Bremner
2021-02-17 20:10 ` [PATCH 09/21] lib/open: reuse directory checks from n_d_c_with_config David Bremner
2021-02-17 20:10 ` [PATCH 10/21] lib/open: factor out the second half of n_d_open_with_config David Bremner
2021-02-17 20:10 ` [PATCH 11/21] lib/open: use _finish_open in n_d_create_with_config David Bremner
2021-02-17 20:10 ` [PATCH 12/21] lib/open: Use check for existing database by trial opening David Bremner
2021-02-17 20:10 ` [PATCH 13/21] support splitting mail from database location David Bremner
2021-02-17 20:10 ` David Bremner [this message]
2021-02-17 20:10 ` [PATCH 15/21] CLI/new: support split database and mail location David Bremner
2021-02-17 20:10 ` [PATCH 16/21] lib/open: support XDG_DATA_HOME as a fallback database location David Bremner
2021-02-17 20:10 ` [PATCH 17/21] CLI/insert: support split database and mail root David Bremner
2021-02-17 20:10 ` [PATCH 18/21] lib/compact: enable split config David Bremner
2021-02-17 20:10 ` [PATCH 19/21] lib/open: fix hook directory calculation in split configuration David Bremner
2021-02-17 20:10 ` [PATCH 20/21] lib/config: add configuration variable for backup directory David Bremner
2021-02-17 20:10 ` [PATCH 21/21] CLI/new: use " David Bremner
2021-03-06 18:40 ` Notmuch and backups Matt Armstrong
2021-03-07 17:51   ` David Bremner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://notmuchmail.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210217201045.2021106-15-david@tethera.net \
    --to=david@tethera.net \
    --cc=notmuch@notmuchmail.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://yhetil.org/notmuch.git/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).