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 YEJuHEwNRWC6ZgAA0tVLHw (envelope-from ) for ; Sun, 07 Mar 2021 17:28:44 +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 qAUmGEwNRWDSVgAA1q6Kng (envelope-from ) for ; Sun, 07 Mar 2021 17:28:44 +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 E9275149BD for ; Sun, 7 Mar 2021 18:28:43 +0100 (CET) Received: from nmbug.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id 82DB428749; Sun, 7 Mar 2021 12:28:09 -0500 (EST) Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) by mail.notmuchmail.org (Postfix) with ESMTP id B4BC02758B for ; Sun, 7 Mar 2021 12:27:49 -0500 (EST) Received: by fethera.tethera.net (Postfix, from userid 1001) id AC7A05FA96; Sun, 7 Mar 2021 12:27:49 -0500 (EST) Received: (nullmailer pid 1091666 invoked by uid 1000); Sun, 07 Mar 2021 17:27:38 -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, 7 Mar 2021 13:27:28 -0400 Message-Id: <20210307172734.1091264-17-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: SMVZXZD6NA53IIVWLVAMTDTTWQPCMJXN X-Message-ID-Hash: SMVZXZD6NA53IIVWLVAMTDTTWQPCMJXN 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=1615138124; 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=9VWYKTqLIuqa7LD7QbCFjuxH4gi5xcxpigo66dSdJHY=; b=j6BquvwuawgUTRSRid4mfmiDiujS4g2KGVBuczr71HTwjFtL/uCwolDsWd2CQi8O69+8UK R3PLDtjNb1Wv9M+BzEX47J9YAcph4zwbzrmP/bEh/FgRKGGelbVYOAoBoGOW0s7qit/5DW I9moXarKKDwmJoixWgswWnAtWRGkc4BEa3ZQa4Dl5QtOfn/GJkT9egi0Cg5XTctnQheg+v SKougPxm+ZshQoyQ2RL2OgKkybcRf/s26s0by36q+RVAKlBeCGzQNuDpkqGj3ijTgjjUEC H6BKzJ/lE/Pdsu8lwUZf20i719oueJu8qaZfllUSrwlsl/K9SLpoVTAmVqvvWQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1615138124; a=rsa-sha256; cv=none; b=cZws8M8oDhJGB4ZVIPt918+t1XtlcJg9jf/Hy9yfOL0Jj9jt087VRVkNKluc5y+xCWPYw3 NLi7nYNmgfpd9WitICNt6GihJKLoFIpRxDHw1dY0yjLa0rqcAVOmEWtvUeY85cFsWjotb+ jwaV1jBJlHgQCBrYM8m9HguBuz88QD4qbA2MJEo/92HLlU9krVAB9W/tTLx7SuFICJ6C2j IV9PEmcgmCAifnaYSVdzX7QNBrSwNkZVAc2YTvrJIF6okoOf1dTM88/ysR/oh+iBjAX3Cp 5/76vzsFvvV/Bh5nfW/TZ/KA4S4uinr1fOo6FjKMK7u/4TE8Fj4TAZl1dtj+Wg== 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.08 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: E9275149BD X-Spam-Score: -1.08 X-Migadu-Scanner: scn0.migadu.com X-TUID: XrGe93OP7RJ4 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. --- 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 e0590a57..287eb715 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; @@ -1048,22 +1049,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"); @@ -1105,7 +1118,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; @@ -1150,6 +1163,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; @@ -1176,7 +1192,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; @@ -1222,7 +1238,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