From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id XZIgO5vhQGCINQAA0tVLHw (envelope-from ) for ; Thu, 04 Mar 2021 13:33:15 +0000 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id UEGcNpvhQGCvLAAA1q6Kng (envelope-from ) for ; Thu, 04 Mar 2021 13:33:15 +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 4864222C32 for ; Thu, 4 Mar 2021 14:33:15 +0100 (CET) Received: from nmbug.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id 3F52427D6E; Thu, 4 Mar 2021 08:32:16 -0500 (EST) Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) by mail.notmuchmail.org (Postfix) with ESMTP id D753F27BC0 for ; Thu, 4 Mar 2021 08:31:48 -0500 (EST) Received: by fethera.tethera.net (Postfix, from userid 1001) id D19325FA96; Thu, 4 Mar 2021 08:31:48 -0500 (EST) Received: (nullmailer pid 4053578 invoked by uid 1000); Thu, 04 Mar 2021 13:31:28 -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: Thu, 4 Mar 2021 09:31:20 -0400 Message-Id: <20210304133125.4050229-18-david@tethera.net> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210304133125.4050229-1-david@tethera.net> References: <20210304133125.4050229-1-david@tethera.net> MIME-Version: 1.0 Message-ID-Hash: JVITODOIM4ERXEX5FZ2RCLQWO2HUIJLJ X-Message-ID-Hash: JVITODOIM4ERXEX5FZ2RCLQWO2HUIJLJ 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=1614864795; 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=nQQ+/cenjFtDMPX4Gw4t1naKVyypVgjChTA5Lh4XRXs=; b=A4Q7UIjAS3kM0GH9U7s514WlwVInzziJH8cfnpOInF4aiS0k87JPxFKDEOhiRqNgoVhJjN BGlD5PYMrqKo5VKoNjMs4VuMZ8887ENcunbnhLyFV6Z+Wln1wX7dgcvrz5aZSN+COzPGfJ 3J55MddSzoUVJaUZ/x1Y1XbsysgE0zLsMfggt6KlbKfn41hJ62Th69WYBeSR+idjCKqUJe tLB1uCBenNqLfPeZ9tCVYhhhu9s6pl8X3rUgMeCvusgqffP8cuUzKAHi/q0PpJrRZ2m+45 Gf7lahO3taJvt6Bqeadul0hPaMyqT6F3bbLieklUa9wDT6UkxgrP3eQgoLwSfQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1614864795; a=rsa-sha256; cv=none; b=NyRHJNG65XVz2ggMkVWHqq5Yw4vkHWMMO6WgGC8qoPg93KQ8+QZv//VTdPjXKP5L57pUfO 4iQ/CCXgfkImdo7AIrGNUN8eAy0YdtJ9BiABQJ3r++0ciRRddXYpjjiHn3jnwwK2LkXmmR 6O3ZxEo+LjkLAQCVvBabYS2hOX+SOKV6TAfH9tPOkTupJKy/RxmIe7iQOLhDlAs0+pVC4N ceKMIo4BYWnTA4NXjCC7e5V4FeZfPcphqeIeyBIobKUaSZrhzPmSPqBTTzNc5KzVM+GRBr irJTai9d8K9187bQbms+sGQCRJjMxg1GrGSePzj/6wbbtWm3bHJt42OwnvcaDg== ARC-Authentication-Results: i=1; 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-Spam-Score: -1.03 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: 4864222C32 X-Spam-Score: -1.03 X-Migadu-Scanner: scn0.migadu.com X-TUID: anqpcoArV0eA 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 | 18 +++++++++++++++--- test/T055-path-config.sh | 35 +++++++++++++++++++++++++++++++++-- test/T560-lib-error.sh | 4 ++-- test/T590-libconfig.sh | 4 ++-- 4 files changed, 52 insertions(+), 9 deletions(-) diff --git a/lib/open.cc b/lib/open.cc index 0b3b9ca4..a21f6252 100644 --- a/lib/open.cc +++ b/lib/open.cc @@ -176,10 +176,12 @@ _db_dir_exists (const char *database_path, char **message) } static notmuch_status_t -_choose_database_path (const char *config_path, +_choose_database_path (void * ctx, + const char *config_path, const char *profile, GKeyFile **key_file, const char **database_path, + bool *split, char **message) { notmuch_status_t status; @@ -197,6 +199,11 @@ _choose_database_path (const char *config_path, if (! *database_path && *key_file) *database_path = g_key_file_get_value (*key_file, "database", "path", NULL); + 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; @@ -446,6 +453,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 (); @@ -455,7 +463,9 @@ notmuch_database_open_with_config (const char *database_path, goto DONE; } - if ((status = _choose_database_path (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); @@ -540,7 +550,9 @@ notmuch_database_create_with_config (const char *database_path, goto DONE; } - if ((status = _choose_database_path (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); 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