From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:c151::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id YM7IF3gNRWCxZgAA0tVLHw (envelope-from ) for ; Sun, 07 Mar 2021 17:29:28 +0000 Received: from aspmx2.migadu.com ([2001:41d0:2:c151::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id ELCGE3gNRWACYwAAB5/wlQ (envelope-from ) for ; Sun, 07 Mar 2021 17:29:28 +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 aspmx2.migadu.com (Postfix) with ESMTPS id CF9B41E9D0 for ; Sun, 7 Mar 2021 18:29:27 +0100 (CET) Received: from nmbug.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id 4A45B2757F; Sun, 7 Mar 2021 12:28:30 -0500 (EST) Received: from fethera.tethera.net (fethera.tethera.net [IPv6:2607:5300:60:c5::1]) by mail.notmuchmail.org (Postfix) with ESMTP id 1ADFE27D48 for ; Sun, 7 Mar 2021 12:27:59 -0500 (EST) Received: by fethera.tethera.net (Postfix, from userid 1001) id 135C25FA96; Sun, 7 Mar 2021 12:27:59 -0500 (EST) Received: (nullmailer pid 1091668 invoked by uid 1000); Sun, 07 Mar 2021 17:27:38 -0000 From: David Bremner To: notmuch@notmuchmail.org Cc: David Bremner Subject: [PATCH 17/22] lib/open: support XDG_DATA_HOME as a fallback database location. Date: Sun, 7 Mar 2021 13:27:29 -0400 Message-Id: <20210307172734.1091264-18-david@tethera.net> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210307172734.1091264-1-david@tethera.net> References: <20210307172734.1091264-1-david@tethera.net> MIME-Version: 1.0 Message-ID-Hash: HQSVXAJITM5QT3RVUUHYF4342LPOAXWN X-Message-ID-Hash: HQSVXAJITM5QT3RVUUHYF4342LPOAXWN 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 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1615138168; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=c1OihQ65DmuMOIopr/03V8HY3Cb7E8ft1C3YIdr0w84=; b=EZU73rxCTWg4Of9qKMa+ZFXCMxT6gofW7Gm0PlyB1sU9M2Ow0i36pjFuyJdnNmNzPmUXVH KRc3Bim3mZb0twpOCpMmTuYJ84ccJoRNh7P0hm8D6LpkV3BK/j7bHGvcFM9sCbOaw9dXNb GtCJxWTrufmE8pjeyBYo+oWD03bTj21M6NhxUnwMWRXOpReTWY2tmChuEgvjQXcOvR/M7D z9REScEeG3itvoJfzJeby85yg5blcQ2txhQOZa9wfRBcNBoYtcsW7CBeL3oIgYzIyVl+N5 DvOtV4zuhS4q1Itx6Qm4sd3gH8cxrOZcmZDYQxCMWTwzOOGONaABK4MNXmNUyg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1615138168; a=rsa-sha256; cv=none; b=KFVCF5PgePREjF4POmPgKG5LOp871PqyfU22E02jY4ExSOKVlTeT7YJftMzYpYjn9xDJFJ fGXyGdbDnIeb3TWsbttX8snJ97fHTcHZjmKkP2qZ7Baf1RCtb8JTx0dTsfrQRvIcIaJ9rp Xbl9MaYTMYXxRIICvZNQQ8CU/BYQ1QjoIGxBTvDvCJxQrxlungdirl+26jMBYuG7HfblOu qfLeT7H/v+D04Aw/DhR1eugy1U0dA/P1IaFquRmvawqqJABDl8B6evkm+HC39JJUkAN188 MrGaeguYYsrVZST5Bx6dh4pvQnMoqDggORiS1QtDCj1Uau/irZaphTgX8NlCUg== ARC-Authentication-Results: i=1; aspmx2.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx2.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 144.217.243.247 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Spam-Score: -1.08 Authentication-Results: aspmx2.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx2.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: CF9B41E9D0 X-Spam-Score: -1.08 X-Migadu-Scanner: scn0.migadu.com X-TUID: lmVJsw0c5dfg This changes some error reporting, either intentionally by reporting the highest level missing directory, or by side effect from looking in XDG locations when given null database location. --- lib/open.cc | 14 ++++++++++++-- test/T055-path-config.sh | 35 +++++++++++++++++++++++++++++++++-- test/T560-lib-error.sh | 4 ++-- test/T590-libconfig.sh | 4 ++-- 4 files changed, 49 insertions(+), 8 deletions(-) diff --git a/lib/open.cc b/lib/open.cc index 1ad026fb..95c93744 100644 --- a/lib/open.cc +++ b/lib/open.cc @@ -181,6 +181,7 @@ _choose_database_path (void *ctx, const char *profile, GKeyFile **key_file, const char **database_path, + bool *split, char **message) { notmuch_status_t status; @@ -203,6 +204,11 @@ _choose_database_path (void *ctx, } } + if (! *database_path) { + *database_path = _xdg_dir (ctx, "XDG_DATA_HOME", ".local/share", profile); + *split = true; + } + if (*database_path == NULL) { *message = strdup ("Error: Cannot open a database for a NULL path.\n"); return NOTMUCH_STATUS_NULL_POINTER; @@ -459,6 +465,7 @@ notmuch_database_open_with_config (const char *database_path, notmuch_database_t *notmuch = NULL; char *message = NULL; GKeyFile *key_file = NULL; + bool split = false; _init_libs (); @@ -468,7 +475,9 @@ notmuch_database_open_with_config (const char *database_path, goto DONE; } - if ((status = _choose_database_path (local, config_path, profile, &key_file, &database_path, &message))) + if ((status = _choose_database_path (local, config_path, profile, + &key_file, &database_path, &split, + &message))) goto DONE; status = _db_dir_exists (database_path, &message); @@ -557,7 +566,8 @@ notmuch_database_create_with_config (const char *database_path, } if ((status = _choose_database_path (local, config_path, profile, - &key_file, &database_path, &message))) + &key_file, &database_path, &split, + &message))) goto DONE; status = _db_dir_exists (database_path, &message); diff --git a/test/T055-path-config.sh b/test/T055-path-config.sh index 6df17f80..f9a8e200 100755 --- a/test/T055-path-config.sh +++ b/test/T055-path-config.sh @@ -37,8 +37,31 @@ symlink_config () { unset DATABASE_PATH } -for config in traditional split symlink; do - # start each set of tests with a known set of messages +xdg_config () { + local dir + local profile=${1:-default} + + if [[ $profile != default ]]; then + export NOTMUCH_PROFILE=$profile + fi + + backup_config + DATABASE_PATH="${HOME}/.local/share/notmuch/${profile}" + rm -rf $DATABASE_PATH + mkdir -p $DATABASE_PATH + + config_dir="${HOME}/.config/notmuch/${profile}" + mkdir -p ${config_dir} + CONFIG_PATH=$config_dir/config + mv ${NOTMUCH_CONFIG} $CONFIG_PATH + unset NOTMUCH_CONFIG + + notmuch --config=${CONFIG_PATH} config set database.mail_root ${TMP_DIRECTORY}/mail + notmuch --config=${CONFIG_PATH} config set database.path +} + +for config in traditional split XDG XDG+profile symlink; do + #start each set of tests with an known set of messages add_email_corpus case $config in @@ -49,6 +72,14 @@ for config in traditional split symlink; do split_config mv mail/.notmuch/xapian $DATABASE_PATH ;; + XDG) + xdg_config + mv mail/.notmuch/xapian $DATABASE_PATH + ;; + XDG+profile) + xdg_config ${RANDOM} + mv mail/.notmuch/xapian $DATABASE_PATH + ;; symlink) symlink_config ;; diff --git a/test/T560-lib-error.sh b/test/T560-lib-error.sh index 03df69d9..89447e9a 100755 --- a/test/T560-lib-error.sh +++ b/test/T560-lib-error.sh @@ -22,7 +22,7 @@ EOF cat <<'EOF' >EXPECTED == stdout == == stderr == -Error: Cannot open a database for a NULL path. +Error: Cannot open database at CWD/home/.local/share/notmuch/default: No such file or directory. EOF test_expect_equal_file EXPECTED OUTPUT @@ -93,7 +93,7 @@ EOF cat <<'EOF' >EXPECTED == stdout == == stderr == -Error: Cannot open a database for a NULL path. +Error: Cannot open database at CWD/home/.local/share/notmuch/default: No such file or directory. EOF test_expect_equal_file EXPECTED OUTPUT diff --git a/test/T590-libconfig.sh b/test/T590-libconfig.sh index 5cf70987..c21c139b 100755 --- a/test/T590-libconfig.sh +++ b/test/T590-libconfig.sh @@ -519,8 +519,8 @@ cat <<'EOF' >EXPECTED == stdout == == stderr == error opening database -Erroneous NULL pointer -Error: Cannot open a database for a NULL path. +Something went wrong trying to read or write a file +Error: Cannot open database at CWD/home/.local/share/notmuch/default: No such file or directory. EOF test_expect_equal_file EXPECTED OUTPUT -- 2.30.1