From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 0D2FEv8XTmAWFgAA0tVLHw (envelope-from ) for ; Sun, 14 Mar 2021 14:04:47 +0000 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id QExgDv8XTmAWTAAAbx9fmQ (envelope-from ) for ; Sun, 14 Mar 2021 14:04:47 +0000 Received: from mail.notmuchmail.org (nmbug.tethera.net [IPv6:2607:5300:201:3100::1657]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id B02AF20F87 for ; Sun, 14 Mar 2021 15:04:46 +0100 (CET) Received: from nmbug.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id 60D4428D13; Sun, 14 Mar 2021 10:03:08 -0400 (EDT) Received: from fethera.tethera.net (fethera.tethera.net [IPv6:2607:5300:60:c5::1]) by mail.notmuchmail.org (Postfix) with ESMTP id 76C0227C76 for ; Sun, 14 Mar 2021 10:02:41 -0400 (EDT) Received: by fethera.tethera.net (Postfix, from userid 1001) id 705DD5FA96; Sun, 14 Mar 2021 10:02:41 -0400 (EDT) Received: (nullmailer pid 183665 invoked by uid 1000); Sun, 14 Mar 2021 14:02:19 -0000 From: David Bremner To: notmuch@notmuchmail.org Cc: David Bremner Subject: [PATCH 16/22] CLI/new: support split database and mail location Date: Sun, 14 Mar 2021 11:02:11 -0300 Message-Id: <20210314140217.183425-17-david@tethera.net> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210314140217.183425-1-david@tethera.net> References: <20210314140217.183425-1-david@tethera.net> MIME-Version: 1.0 Message-ID-Hash: CFOBHV6JMQW62S7M44KORDLE2F2RIZ77 X-Message-ID-Hash: CFOBHV6JMQW62S7M44KORDLE2F2RIZ77 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=1615730686; 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=BdWOXZ+sApsRQ/dLt0bTvWWOpCSnmLUR/KJPxCYa29A=; b=Jlmo4IlQPVj94rl2uHLIA04W4N/vlnoxNMU3KXY12XVfRo2ZTfcRQq0IFwICCdi/XhRbfO 9du1Tvs52/+FTrYywCpSdHH+DgTdfGimpGTCEblXNrFou3XHo3SclRJ5mP5nWIigAWIKwE zog2RMNSNrUTs6ne55viVcp9XFcYE4f0xD5ZmPX8LXF8RmM0TKNGzisvd4RS/2FNjZuysG 2RMjqYN1ckSpSdkfCHBY27cAc+VzcS3tW/H30ZqrNEIQqK3oWwSH/BahUMTje0RDoUvv3R ePQf/I7EjF/aT3W1XfJmZ+HYSnWpV1IXBKuiODgAD5QU9/gI12iTx1oM2qZDcA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1615730686; a=rsa-sha256; cv=none; b=L+67aEIeMOj24OmXtU5YqFIEuOS6d2UgWEytm/LoKdW+AJ+/XpXMOorqSn6Awp1EJs4hvH j1GL5Df7VfBRX5EO87v4AqECnjsqPB+mvJxqAE839AWVcn8j7+ZFhP/WSOlTeoXGAhjrNL qbZoBORatKgVmPr6v9Ia04KTBJJ9mhtM2wWGqmXGgvDgW0JdT/8qtzuvTQBgq5kkw+A57f JxsUtMJ9F6V0dWmLclvhmSosAdJvYM4EIUNaacnfWv7Fu+uHFXyMewEqeBq7QE2aVWky29 hplB0CYSuXy5UNZdp/x9FQ1X4qCGhaujEd+3vZEiC7GAuPQF+XQg5f0ei9ck4A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 2607:5300:201:3100::1657 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Spam-Score: -1.00 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 2607:5300:201:3100::1657 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Queue-Id: B02AF20F87 X-Spam-Score: -1.00 X-Migadu-Scanner: scn0.migadu.com X-TUID: XDSnoBirPi/y This adds new state variable for the mail root, and uses it most places db_path was used. The notable exception is dumps from backups. The latter will be dealt with properly in a future commit. --- notmuch-new.c | 54 ++++++++++++++++++++++++++-------------- test/T055-path-config.sh | 41 ++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 19 deletions(-) diff --git a/notmuch-new.c b/notmuch-new.c index 223d68bb..30062512 100644 --- a/notmuch-new.c +++ b/notmuch-new.c @@ -43,6 +43,7 @@ enum verbosity { typedef struct { const char *db_path; + const char *mail_root; int output_is_a_tty; enum verbosity verbosity; @@ -307,18 +308,18 @@ _setup_ignore (notmuch_database_t *notmuch, add_files_state_t *state) } static char * -_get_relative_path (const char *db_path, const char *dirpath, const char *entry) +_get_relative_path (const char *mail_root, const char *dirpath, const char *entry) { - size_t db_path_len = strlen (db_path); + size_t mail_root_len = strlen (mail_root); /* paranoia? */ - if (strncmp (dirpath, db_path, db_path_len) != 0) { + if (strncmp (dirpath, mail_root, mail_root_len) != 0) { fprintf (stderr, "Warning: '%s' is not a subdirectory of '%s'\n", - dirpath, db_path); + dirpath, mail_root); return NULL; } - dirpath += db_path_len; + dirpath += mail_root_len; while (*dirpath == '/') dirpath++; @@ -346,7 +347,7 @@ _entry_in_ignore_list (add_files_state_t *state, const char *dirpath, if (state->ignore_regex_length == 0) return false; - path = _get_relative_path (state->db_path, dirpath, entry); + path = _get_relative_path (state->mail_root, dirpath, entry); if (! path) return false; @@ -1050,22 +1051,34 @@ _maybe_upgrade (notmuch_database_t *notmuch, add_files_state_t *state) if (notmuch_database_needs_upgrade (notmuch)) { time_t now = time (NULL); struct tm *gm_time = gmtime (&now); + struct stat st; + int err; notmuch_status_t status; char *dot_notmuch_path = talloc_asprintf (notmuch, "%s/%s", state->db_path, ".notmuch"); + const char *backup_name; + + err = stat (dot_notmuch_path, &st); + if (err) { + if (errno == ENOENT) { + dot_notmuch_path = NULL; + } else { + fprintf (stderr, "Failed to stat %s: %s\n", dot_notmuch_path, strerror (errno)); + return EXIT_FAILURE; + } + } + /* since dump files are written atomically, the amount of * harm from overwriting one within a second seems * relatively small. */ - - const char *backup_name = - talloc_asprintf (notmuch, "%s/dump-%04d%02d%02dT%02d%02d%02d.gz", - dot_notmuch_path, - gm_time->tm_year + 1900, - gm_time->tm_mon + 1, - gm_time->tm_mday, - gm_time->tm_hour, - gm_time->tm_min, - gm_time->tm_sec); + backup_name = talloc_asprintf (notmuch, "%s/dump-%04d%02d%02dT%02d%02d%02d.gz", + dot_notmuch_path ? dot_notmuch_path : state->db_path, + gm_time->tm_year + 1900, + gm_time->tm_mon + 1, + gm_time->tm_mday, + gm_time->tm_hour, + gm_time->tm_min, + gm_time->tm_sec); if (state->verbosity >= VERBOSITY_NORMAL) { printf ("Welcome to a new version of notmuch! Your database will now be upgraded.\n"); @@ -1108,7 +1121,7 @@ notmuch_new_command (unused(notmuch_config_t *config), notmuch_database_t *notmu }; struct timeval tv_start; int ret = 0; - const char *db_path; + const char *db_path, *mail_root; struct sigaction action; _filename_node_t *f; int opt_index; @@ -1153,6 +1166,9 @@ notmuch_new_command (unused(notmuch_config_t *config), notmuch_database_t *notmu db_path = notmuch_config_get (notmuch, NOTMUCH_CONFIG_DATABASE_PATH); add_files_state.db_path = db_path; + mail_root = notmuch_config_get (notmuch, NOTMUCH_CONFIG_MAIL_ROOT); + add_files_state.mail_root = mail_root; + if (! _setup_ignore (notmuch, &add_files_state)) return EXIT_FAILURE; @@ -1179,7 +1195,7 @@ notmuch_new_command (unused(notmuch_config_t *config), notmuch_database_t *notmu if (notmuch_database_get_revision (notmuch, NULL) == 0) { int count = 0; - count_files (db_path, &count, &add_files_state); + count_files (mail_root, &count, &add_files_state); if (interrupted) return EXIT_FAILURE; @@ -1225,7 +1241,7 @@ notmuch_new_command (unused(notmuch_config_t *config), notmuch_database_t *notmu timer_is_active = true; } - ret = add_files (notmuch, db_path, &add_files_state); + ret = add_files (notmuch, mail_root, &add_files_state); if (ret) goto DONE; diff --git a/test/T055-path-config.sh b/test/T055-path-config.sh index 19a8a4ab..6df17f80 100755 --- a/test/T055-path-config.sh +++ b/test/T055-path-config.sh @@ -95,6 +95,47 @@ EOF notmuch search --output=messages '*' > OUTPUT test_expect_equal_file EXPECTED OUTPUT + test_begin_subtest "use existing database ($config)" + output=$(notmuch new) + test_expect_equal "$output" 'No new mail.' + + test_begin_subtest "create database ($config)" + rm -rf $DATABASE_PATH/{.notmuch,}/xapian + notmuch new + output=$(notmuch count '*') + test_expect_equal "$output" '52' + + test_begin_subtest "detect new files ($config)" + generate_message + generate_message + notmuch new + output=$(notmuch count '*') + test_expect_equal "$output" '54' + + test_begin_subtest "Show a raw message ($config)" + add_message + notmuch show --format=raw id:$gen_msg_id > OUTPUT + test_expect_equal_file $gen_msg_filename OUTPUT + rm -f $gen_msg_filename + + test_begin_subtest "reply ($config)" + add_message '[from]="Sender "' \ + [to]=test_suite@notmuchmail.org \ + [subject]=notmuch-reply-test \ + '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \ + '[body]="basic reply test"' + notmuch reply id:${gen_msg_id} 2>&1 > OUTPUT + cat < EXPECTED +From: Notmuch Test Suite +Subject: Re: notmuch-reply-test +To: Sender +In-Reply-To: <${gen_msg_id}> +References: <${gen_msg_id}> + +On Tue, 05 Jan 2010 15:43:56 -0000, Sender wrote: +> basic reply test +EOF + test_expect_equal_file EXPECTED OUTPUT restore_config done -- 2.30.1