lib/config: add configuration variable for backup directory

Like the hook directory, we primarily need a way to communicate this
directory between various components, but we may as well let the user
configure it.

Most of the diff is generalizing choose_hook_dir to work for both
backup and hook directories.

diff --git a/lib/config.cc b/lib/config.cc
index f2060e281cea249c1ef06b7a6fe6d05732e10b00..8bd3c35a512794e2a5c22b7cb3bc4f4e3543ec1a 100644 (file)
--- a/lib/config.cc
+++ b/lib/config.cc
@@ -410,6 +410,8 @@ _notmuch_config_key_to_string (notmuch_config_key_t key)
        return "database.mail_root";
     case NOTMUCH_CONFIG_HOOK_DIR:
        return "database.hook_dir";
+    case NOTMUCH_CONFIG_BACKUP_DIR:
+       return "database.backup_dir";
     case NOTMUCH_CONFIG_EXCLUDE_TAGS:
        return "search.exclude_tags";
     case NOTMUCH_CONFIG_NEW_TAGS:
@@ -453,6 +455,7 @@ _notmuch_config_default (notmuch_database_t *notmuch, notmuch_config_key_t key)
     case NOTMUCH_CONFIG_SYNC_MAILDIR_FLAGS:
        return "true";
     case NOTMUCH_CONFIG_HOOK_DIR:
+    case NOTMUCH_CONFIG_BACKUP_DIR:
     case NOTMUCH_CONFIG_NEW_IGNORE:
     case NOTMUCH_CONFIG_USER_NAME:
     case NOTMUCH_CONFIG_PRIMARY_EMAIL:

diff --git a/lib/notmuch.h b/lib/notmuch.h
index c9b017192eab230191d04c31209355760f292ed0..f9efd79ede5384f7a7755c36fe77f48e78ffb565 100644 (file)
--- a/lib/notmuch.h
+++ b/lib/notmuch.h
@@ -2476,6 +2476,7 @@ typedef enum _notmuch_config_key {
     NOTMUCH_CONFIG_DATABASE_PATH = NOTMUCH_CONFIG_FIRST,
     NOTMUCH_CONFIG_MAIL_ROOT,
     NOTMUCH_CONFIG_HOOK_DIR,
+    NOTMUCH_CONFIG_BACKUP_DIR,
     NOTMUCH_CONFIG_EXCLUDE_TAGS,
     NOTMUCH_CONFIG_NEW_TAGS,
     NOTMUCH_CONFIG_NEW_IGNORE,

diff --git a/lib/open.cc b/lib/open.cc
index ec0de4c35c1ace550866c2d836cd61e30e50c83c..8f572b0b4f5557a43e7ab516edbaf39580e75173 100644 (file)
--- a/lib/open.cc
+++ b/lib/open.cc
@@ -71,39 +71,43 @@ _xdg_dir (void *ctx,
 }
 
 static notmuch_status_t
-_choose_hook_dir (notmuch_database_t *notmuch,
-                 const char *profile,
-                 char **message)
+_choose_dir (notmuch_database_t *notmuch,
+            const char *profile,
+            notmuch_config_key_t key,
+            const char *xdg_var,
+            const char *xdg_subdir,
+            const char *subdir,
+            char **message = NULL)
 {
-    const char *config;
-    const char *hook_dir;
+    const char *parent;
+    const char *dir;
     struct stat st;
     int err;
 
-    hook_dir = notmuch_config_get (notmuch, NOTMUCH_CONFIG_HOOK_DIR);
+    dir = notmuch_config_get (notmuch, key);
 
-    if (hook_dir)
+    if (dir)
        return NOTMUCH_STATUS_SUCCESS;
 
-    config = _xdg_dir (notmuch, "XDG_CONFIG_HOME", ".config", profile);
-    if (! config)
+    parent = _xdg_dir (notmuch, xdg_var, xdg_subdir, profile);
+    if (! parent)
        return NOTMUCH_STATUS_PATH_ERROR;
 
-    hook_dir = talloc_asprintf (notmuch, "%s/hooks", config);
+    dir = talloc_asprintf (notmuch, "%s/%s", parent, subdir);
 
-    err = stat (hook_dir, &st);
+    err = stat (dir, &st);
     if (err) {
        if (errno == ENOENT) {
            char *notmuch_path = dirname (talloc_strdup (notmuch, notmuch->xapian_path));
-           hook_dir = talloc_asprintf (notmuch, "%s/hooks", notmuch_path);
+           dir = talloc_asprintf (notmuch, "%s/%s", notmuch_path, subdir);
        } else {
            IGNORE_RESULT (asprintf (message, "Error: Cannot stat %s: %s.\n",
-                                    hook_dir, strerror (errno)));
+                                    dir, strerror (errno)));
            return NOTMUCH_STATUS_FILE_ERROR;
        }
     }
 
-    _notmuch_config_cache (notmuch, NOTMUCH_CONFIG_HOOK_DIR, hook_dir);
+    _notmuch_config_cache (notmuch, key, dir);
 
     return NOTMUCH_STATUS_SUCCESS;
 }
@@ -428,10 +432,23 @@ _finish_open (notmuch_database_t *notmuch,
        if (status)
            goto DONE;
 
-       status = _choose_hook_dir (notmuch, profile, &message);
+       status = _choose_dir (notmuch, profile,
+                             NOTMUCH_CONFIG_HOOK_DIR,
+                             "XDG_CONFIG_HOME",
+                             ".config",
+                             "hooks",
+                             &message);
        if (status)
            goto DONE;
 
+       status = _choose_dir (notmuch, profile,
+                             NOTMUCH_CONFIG_BACKUP_DIR,
+                             "XDG_DATA_HOME",
+                             ".local/share",
+                             "backups",
+                             &message);
+       if (status)
+           goto DONE;
        status = _notmuch_config_load_defaults (notmuch);
        if (status)
            goto DONE;

diff --git a/test/T590-libconfig.sh b/test/T590-libconfig.sh
index c21c139bc97bd0a99f917fa28c0000eb8096f89f..310668a9fba95f803880acf598e1a79b4a58099c 100755 (executable)
--- a/test/T590-libconfig.sh
+++ b/test/T590-libconfig.sh
@@ -366,6 +366,7 @@ cat <<'EOF' >EXPECTED
 MAIL_DIR
 MAIL_DIR
 MAIL_DIR/.notmuch/hooks
+MAIL_DIR/.notmuch/backups
 
 inbox;unread
 NULL