From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id +J8AHC6JIGACDgAA0tVLHw (envelope-from ) for ; Mon, 08 Feb 2021 00:43:26 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id 6AnsFy6JIGAPIQAA1q6Kng (envelope-from ) for ; Mon, 08 Feb 2021 00:43:26 +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) server-signature RSA-PSS (2048 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id D54C894029C for ; Mon, 8 Feb 2021 00:43:25 +0000 (UTC) Received: from nmbug.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id 1C7011FE25; Sun, 7 Feb 2021 19:42:06 -0500 (EST) Received: from fethera.tethera.net (fethera.tethera.net [IPv6:2607:5300:60:c5::1]) by mail.notmuchmail.org (Postfix) with ESMTP id 0089720071 for ; Sun, 7 Feb 2021 19:41:39 -0500 (EST) Received: by fethera.tethera.net (Postfix, from userid 1001) id F0041606DB; Sun, 7 Feb 2021 19:41:38 -0500 (EST) Received: (nullmailer pid 1193282 invoked by uid 1000); Mon, 08 Feb 2021 00:41:15 -0000 From: David Bremner To: notmuch@notmuchmail.org Cc: David Bremner Subject: [PATCH 15/23] CLI/new: support split database and mail location Date: Sun, 7 Feb 2021 20:41:01 -0400 Message-Id: <20210208004109.1192719-16-david@tethera.net> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210208004109.1192719-1-david@tethera.net> References: <20210208004109.1192719-1-david@tethera.net> MIME-Version: 1.0 Message-ID-Hash: K56GS3E4UECL5QYHCUYXM6IM4KUYAHPR X-Message-ID-Hash: K56GS3E4UECL5QYHCUYXM6IM4KUYAHPR 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: -1.05 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: D54C894029C X-Spam-Score: -1.05 X-Migadu-Scanner: scn0.migadu.com X-TUID: MXe8QBtrHhKa 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 | 13 ++++++++++ 2 files changed, 48 insertions(+), 19 deletions(-) diff --git a/notmuch-new.c b/notmuch-new.c index 21e66af1..63ac10a6 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; @@ -1047,22 +1048,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"); @@ -1104,7 +1117,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; @@ -1149,6 +1162,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; @@ -1175,7 +1191,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; @@ -1221,7 +1237,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 c82b6a14..6882ab16 100755 --- a/test/T055-path-config.sh +++ b/test/T055-path-config.sh @@ -87,6 +87,19 @@ for config in traditional split+prefix split XDG XDG+profile; do notmuch tag -$tag '*' test_expect_equal "$output" '52' + 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' + restore_config done -- 2.30.0