From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 4PZzCmV4LWDiGAAA0tVLHw (envelope-from ) for ; Wed, 17 Feb 2021 20:11:17 +0000 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id kCpOBmV4LWAHZAAAB5/wlQ (envelope-from ) for ; Wed, 17 Feb 2021 20:11:17 +0000 Received: from mail.notmuchmail.org (nmbug.tethera.net [144.217.243.247]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 6DF2B2133C for ; Wed, 17 Feb 2021 21:11:16 +0100 (CET) Received: from nmbug.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id D72DA26A3B; Wed, 17 Feb 2021 15:11:00 -0500 (EST) Received: from fethera.tethera.net (fethera.tethera.net [IPv6:2607:5300:60:c5::1]) by mail.notmuchmail.org (Postfix) with ESMTP id 9DDFB202B3 for ; Wed, 17 Feb 2021 15:10:54 -0500 (EST) Received: by fethera.tethera.net (Postfix, from userid 1001) id 3EBEE606DF; Wed, 17 Feb 2021 15:10:53 -0500 (EST) Received: (nullmailer pid 2021446 invoked by uid 1000); Wed, 17 Feb 2021 20:10:50 -0000 From: David Bremner To: notmuch@notmuchmail.org Cc: David Bremner Subject: [PATCH 20/21] lib/config: add configuration variable for backup directory Date: Wed, 17 Feb 2021 16:10:44 -0400 Message-Id: <20210217201045.2021106-21-david@tethera.net> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210217201045.2021106-1-david@tethera.net> References: <20210217201045.2021106-1-david@tethera.net> MIME-Version: 1.0 Message-ID-Hash: HAMOA3PWKILZKGBIMBRBDRDQO7LAXRHG X-Message-ID-Hash: HAMOA3PWKILZKGBIMBRBDRDQO7LAXRHG X-MailFrom: bremner@tethera.net X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-notmuch.notmuchmail.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.1 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: 0.47 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 144.217.243.247 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Queue-Id: 6DF2B2133C X-Spam-Score: 0.47 X-Migadu-Scanner: scn0.migadu.com X-TUID: MWpe8Q2KoHtm 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. --- lib/config.cc | 3 +++ lib/notmuch.h | 1 + lib/open.cc | 47 ++++++++++++++++++++++++++++-------------- test/T590-libconfig.sh | 1 + 4 files changed, 37 insertions(+), 15 deletions(-) diff --git a/lib/config.cc b/lib/config.cc index 3b8f1092..32ed6f8f 100644 --- a/lib/config.cc +++ b/lib/config.cc @@ -394,6 +394,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: @@ -436,6 +438,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 374d3af9..5e4f1dac 100644 --- a/lib/notmuch.h +++ b/lib/notmuch.h @@ -2475,6 +2475,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 4324deae..e5ef351e 100644 --- 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; } @@ -413,10 +417,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 c21c139b..310668a9 100755 --- 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 -- 2.30.0