X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-new.c;h=f079f62a63968c7ce19a2045de428864eb82e399;hp=8529fdd3eac7e4214c47ef24317bed961b2912b5;hb=33382c2b5ba2537952a60ea378feff36961e4713;hpb=b1fa95721bd54c60c367ae4fb54279404656a070 diff --git a/notmuch-new.c b/notmuch-new.c index 8529fdd3..f079f62a 100644 --- a/notmuch-new.c +++ b/notmuch-new.c @@ -13,12 +13,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/ . + * along with this program. If not, see https://www.gnu.org/licenses/ . * * Author: Carl Worth */ #include "notmuch-client.h" +#include "tag-util.h" #include @@ -41,24 +42,30 @@ enum verbosity { }; typedef struct { + const char *db_path; + int output_is_a_tty; enum verbosity verbosity; - notmuch_bool_t debug; + bool debug; + bool full_scan; const char **new_tags; size_t new_tags_length; - const char **new_ignore; - size_t new_ignore_length; + const char **ignore_verbatim; + size_t ignore_verbatim_length; + regex_t *ignore_regex; + size_t ignore_regex_length; int total_files; int processed_files; int added_messages, removed_messages, renamed_messages; + int vanished_files; struct timeval tv_start; _filename_list_t *removed_files; _filename_list_t *removed_directories; _filename_list_t *directory_mtimes; - notmuch_bool_t synchronize_flags; + bool synchronize_flags; } add_files_state_t; static volatile sig_atomic_t do_print_progress = 0; @@ -80,7 +87,7 @@ handle_sigint (unused (int sig)) * result. It is not required for correctness, and if it does * fail or produce a short write, we want to get out of the signal * handler as quickly as possible, not retry it. */ - IGNORE_RESULT (write (2, msg, sizeof(msg)-1)); + IGNORE_RESULT (write (2, msg, sizeof (msg) - 1)); interrupted = 1; } @@ -129,10 +136,10 @@ generic_print_progress (const char *action, const char *object, elapsed_overall = notmuch_time_elapsed (tv_start, tv_now); rate_overall = processed / elapsed_overall; - printf ("%s %d ", action, processed); + printf ("%s %u ", action, processed); if (total) { - printf ("of %d %s", total, object); + printf ("of %u %s", total, object); if (processed > 0 && elapsed_overall > 0.5) { double time_remaining = ((total - processed) / rate_overall); printf (" ("); @@ -177,23 +184,23 @@ dirent_type (const char *path, const struct dirent *entry) /* Mapping from d_type to stat mode_t. We omit DT_LNK so that * we'll fall through to stat and get the real file type. */ static const mode_t modes[] = { - [DT_BLK] = S_IFBLK, - [DT_CHR] = S_IFCHR, - [DT_DIR] = S_IFDIR, + [DT_BLK] = S_IFBLK, + [DT_CHR] = S_IFCHR, + [DT_DIR] = S_IFDIR, [DT_FIFO] = S_IFIFO, - [DT_REG] = S_IFREG, + [DT_REG] = S_IFREG, [DT_SOCK] = S_IFSOCK }; - if (entry->d_type < ARRAY_SIZE(modes) && modes[entry->d_type]) + if (entry->d_type < ARRAY_SIZE (modes) && modes[entry->d_type]) return modes[entry->d_type]; #endif abspath = talloc_asprintf (NULL, "%s/%s", path, entry->d_name); - if (!abspath) { + if (! abspath) { errno = ENOMEM; return -1; } - err = stat(abspath, &statbuf); + err = stat (abspath, &statbuf); saved_errno = errno; talloc_free (abspath); if (err < 0) { @@ -219,10 +226,9 @@ _entries_resemble_maildir (const char *path, struct dirent **entries, int count) if (dirent_type (path, entries[i]) != S_IFDIR) continue; - if (strcmp(entries[i]->d_name, "new") == 0 || - strcmp(entries[i]->d_name, "cur") == 0 || - strcmp(entries[i]->d_name, "tmp") == 0) - { + if (strcmp (entries[i]->d_name, "new") == 0 || + strcmp (entries[i]->d_name, "cur") == 0 || + strcmp (entries[i]->d_name, "tmp") == 0) { found++; if (found == 3) return 1; @@ -232,18 +238,131 @@ _entries_resemble_maildir (const char *path, struct dirent **entries, int count) return 0; } +static bool +_special_directory (const char *entry) +{ + return strcmp (entry, ".") == 0 || strcmp (entry, "..") == 0; +} + +static bool +_setup_ignore (notmuch_config_t *config, add_files_state_t *state) +{ + const char **ignore_list, **ignore; + int nregex = 0, nverbatim = 0; + const char **verbatim = NULL; + regex_t *regex = NULL; + + ignore_list = notmuch_config_get_new_ignore (config, NULL); + if (! ignore_list) + return true; + + for (ignore = ignore_list; *ignore; ignore++) { + const char *s = *ignore; + size_t len = strlen (s); + + if (len == 0) { + fprintf (stderr, "Error: Empty string in new.ignore list\n"); + return false; + } + + if (s[0] == '/') { + regex_t *preg; + char *r; + int rerr; + + if (len < 3 || s[len - 1] != '/') { + fprintf (stderr, "Error: Malformed pattern '%s' in new.ignore\n", + s); + return false; + } + + r = talloc_strndup (config, s + 1, len - 2); + regex = talloc_realloc (config, regex, regex_t, nregex + 1); + preg = ®ex[nregex]; + + rerr = regcomp (preg, r, REG_EXTENDED | REG_NOSUB); + if (rerr) { + size_t error_size = regerror (rerr, preg, NULL, 0); + char *error = talloc_size (r, error_size); + + regerror (rerr, preg, error, error_size); + + fprintf (stderr, "Error: Invalid regex '%s' in new.ignore: %s\n", + r, error); + return false; + } + nregex++; + + talloc_free (r); + } else { + verbatim = talloc_realloc (config, verbatim, const char *, + nverbatim + 1); + verbatim[nverbatim++] = s; + } + } + + state->ignore_regex = regex; + state->ignore_regex_length = nregex; + state->ignore_verbatim = verbatim; + state->ignore_verbatim_length = nverbatim; + + return true; +} + +static char * +_get_relative_path (const char *db_path, const char *dirpath, const char *entry) +{ + size_t db_path_len = strlen (db_path); + + /* paranoia? */ + if (strncmp (dirpath, db_path, db_path_len) != 0) { + fprintf (stderr, "Warning: '%s' is not a subdirectory of '%s'\n", + dirpath, db_path); + return NULL; + } + + dirpath += db_path_len; + while (*dirpath == '/') + dirpath++; + + if (*dirpath) + return talloc_asprintf (NULL, "%s/%s", dirpath, entry); + else + return talloc_strdup (NULL, entry); +} + /* Test if the file/directory is to be ignored. */ -static notmuch_bool_t -_entry_in_ignore_list (const char *entry, add_files_state_t *state) +static bool +_entry_in_ignore_list (add_files_state_t *state, const char *dirpath, + const char *entry) { + bool ret = false; size_t i; + char *path; + + for (i = 0; i < state->ignore_verbatim_length; i++) { + if (strcmp (entry, state->ignore_verbatim[i]) == 0) + return true; + } + + if (state->ignore_regex_length == 0) + return false; + + path = _get_relative_path (state->db_path, dirpath, entry); + if (! path) + return false; + + for (i = 0; i < state->ignore_regex_length; i++) { + if (regexec (&state->ignore_regex[i], path, 0, NULL, 0) == 0) { + ret = true; + break; + } + } - for (i = 0; i < state->new_ignore_length; i++) - if (strcmp (entry, state->new_ignore[i]) == 0) - return TRUE; + talloc_free (path); - return FALSE; + return ret; } /* Add a single file to the database. */ @@ -259,16 +378,22 @@ add_file (notmuch_database_t *notmuch, const char *filename, if (status) goto DONE; - status = notmuch_database_add_message (notmuch, filename, &message); + status = notmuch_database_index_file (notmuch, filename, indexing_cli_choices.opts, &message); switch (status) { /* Success. */ case NOTMUCH_STATUS_SUCCESS: state->added_messages++; notmuch_message_freeze (message); - for (tag = state->new_tags; *tag != NULL; tag++) - notmuch_message_add_tag (message, *tag); if (state->synchronize_flags) notmuch_message_maildir_flags_to_tags (message); + + for (tag = state->new_tags; *tag != NULL; tag++) { + if (strcmp ("unread", *tag) != 0 || + ! notmuch_message_has_maildir_flag (message, 'S')) { + notmuch_message_add_tag (message, *tag); + } + } + notmuch_message_thaw (message); break; /* Non-fatal issues (go on to next file). */ @@ -279,12 +404,17 @@ add_file (notmuch_database_t *notmuch, const char *filename, case NOTMUCH_STATUS_FILE_NOT_EMAIL: fprintf (stderr, "Note: Ignoring non-mail file: %s\n", filename); break; + case NOTMUCH_STATUS_FILE_ERROR: + /* Someone renamed/removed the file between scandir and now. */ + state->vanished_files++; + fprintf (stderr, "Unexpected error with file %s\n", filename); + (void) print_status_database ("add_file", notmuch, status); + break; /* Fatal issues. Don't process anymore. */ case NOTMUCH_STATUS_READ_ONLY_DATABASE: case NOTMUCH_STATUS_XAPIAN_EXCEPTION: case NOTMUCH_STATUS_OUT_OF_MEMORY: - fprintf (stderr, "Error: %s. Halting processing.\n", - notmuch_status_to_string (status)); + (void) print_status_database ("add_file", notmuch, status); goto DONE; default: INTERNAL_ERROR ("add_message returned unexpected value: %d", status); @@ -346,7 +476,6 @@ add_files (notmuch_database_t *notmuch, const char *path, add_files_state_t *state) { - DIR *dir = NULL; struct dirent *entry = NULL; char *next = NULL; time_t fs_mtime, db_mtime; @@ -358,7 +487,7 @@ add_files (notmuch_database_t *notmuch, notmuch_filenames_t *db_subdirs = NULL; time_t stat_time; struct stat st; - notmuch_bool_t is_maildir; + bool is_maildir; if (stat (path, &st)) { fprintf (stderr, "Error reading directory %s: %s\n", @@ -398,13 +527,13 @@ add_files (notmuch_database_t *notmuch, * mistakenly return the total number of directory entries, since * that only inflates the count beyond 2. */ - if (directory && fs_mtime == db_mtime && st.st_nlink == 2) { + if (directory && (! state->full_scan) && fs_mtime == db_mtime && st.st_nlink == 2) { /* There's one catch: pass 1 below considers symlinks to * directories to be directories, but these don't increase the * file system link count. So, only bail early if the * database agrees that there are no sub-directories. */ db_subdirs = notmuch_directory_get_child_directories (directory); - if (!notmuch_filenames_valid (db_subdirs)) + if (! notmuch_filenames_valid (db_subdirs)) goto DONE; notmuch_filenames_destroy (db_subdirs); db_subdirs = NULL; @@ -431,20 +560,21 @@ add_files (notmuch_database_t *notmuch, /* Pass 1: Recurse into all sub-directories. */ is_maildir = _entries_resemble_maildir (path, fs_entries, num_fs_entries); - for (i = 0; i < num_fs_entries; i++) { - if (interrupted) - break; - + for (i = 0; i < num_fs_entries && ! interrupted; i++) { entry = fs_entries[i]; + /* Ignore special directories to avoid infinite recursion. */ + if (_special_directory (entry->d_name)) + continue; + /* Ignore any files/directories the user has configured to * ignore. We do this before dirent_type both for performance * and because we don't care if dirent_type fails on entries * that are explicitly ignored. */ - if (_entry_in_ignore_list (entry->d_name, state)) { + if (_entry_in_ignore_list (state, path, entry->d_name)) { if (state->debug) - printf ("(D) add_files_recursive, pass 1: explicitly ignoring %s/%s\n", + printf ("(D) add_files, pass 1: explicitly ignoring %s/%s\n", path, entry->d_name); continue; } @@ -462,13 +592,10 @@ add_files (notmuch_database_t *notmuch, continue; } - /* Ignore special directories to avoid infinite recursion. - * Also ignore the .notmuch directory and any "tmp" directory + /* Ignore the .notmuch directory and any "tmp" directory * that appears within a maildir. */ - if (strcmp (entry->d_name, ".") == 0 || - strcmp (entry->d_name, "..") == 0 || - (is_maildir && strcmp (entry->d_name, "tmp") == 0) || + if ((is_maildir && strcmp (entry->d_name, "tmp") == 0) || strcmp (entry->d_name, ".notmuch") == 0) continue; @@ -491,7 +618,7 @@ add_files (notmuch_database_t *notmuch, * being discovered until the clock catches up and the directory * is modified again). */ - if (directory && fs_mtime == db_mtime) + if (directory && (! state->full_scan) && fs_mtime == db_mtime) goto DONE; /* If the database has never seen this directory before, we can @@ -502,45 +629,48 @@ add_files (notmuch_database_t *notmuch, } /* Pass 2: Scan for new files, removed files, and removed directories. */ - for (i = 0; i < num_fs_entries; i++) - { - if (interrupted) - break; + for (i = 0; i < num_fs_entries && ! interrupted; i++) { + entry = fs_entries[i]; - entry = fs_entries[i]; + /* Ignore special directories early. */ + if (_special_directory (entry->d_name)) + continue; /* Ignore files & directories user has configured to be ignored */ - if (_entry_in_ignore_list (entry->d_name, state)) { + if (_entry_in_ignore_list (state, path, entry->d_name)) { if (state->debug) - printf ("(D) add_files_recursive, pass 2: explicitly ignoring %s/%s\n", - path, - entry->d_name); + printf ("(D) add_files, pass 2: explicitly ignoring %s/%s\n", + path, entry->d_name); continue; } /* Check if we've walked past any names in db_files or * db_subdirs. If so, these have been deleted. */ while (notmuch_filenames_valid (db_files) && - strcmp (notmuch_filenames_get (db_files), entry->d_name) < 0) - { + strcmp (notmuch_filenames_get (db_files), entry->d_name) < 0) { char *absolute = talloc_asprintf (state->removed_files, "%s/%s", path, notmuch_filenames_get (db_files)); + if (state->debug) + printf ("(D) add_files, pass 2: queuing passed file %s for deletion from database\n", + absolute); + _filename_list_add (state->removed_files, absolute); notmuch_filenames_move_to_next (db_files); } while (notmuch_filenames_valid (db_subdirs) && - strcmp (notmuch_filenames_get (db_subdirs), entry->d_name) <= 0) - { + strcmp (notmuch_filenames_get (db_subdirs), entry->d_name) <= 0) { const char *filename = notmuch_filenames_get (db_subdirs); - if (strcmp (filename, entry->d_name) < 0) - { + if (strcmp (filename, entry->d_name) < 0) { char *absolute = talloc_asprintf (state->removed_directories, "%s/%s", path, filename); + if (state->debug) + printf ("(D) add_files, pass 2: queuing passed directory %s for deletion from database\n", + absolute); _filename_list_add (state->removed_directories, absolute); } @@ -560,8 +690,7 @@ add_files (notmuch_database_t *notmuch, /* Don't add a file that we've added before. */ if (notmuch_filenames_valid (db_files) && - strcmp (notmuch_filenames_get (db_files), entry->d_name) == 0) - { + strcmp (notmuch_filenames_get (db_files), entry->d_name) == 0) { notmuch_filenames_move_to_next (db_files); continue; } @@ -574,12 +703,12 @@ add_files (notmuch_database_t *notmuch, if (state->verbosity >= VERBOSITY_VERBOSE) { if (state->output_is_a_tty) - printf("\r\033[K"); + printf ("\r\033[K"); printf ("%i/%i: %s", state->processed_files, state->total_files, next); - putchar((state->output_is_a_tty) ? '\r' : '\n'); + putchar ((state->output_is_a_tty) ? '\r' : '\n'); fflush (stdout); } @@ -604,23 +733,28 @@ add_files (notmuch_database_t *notmuch, /* Now that we've walked the whole filesystem list, anything left * over in the database lists has been deleted. */ - while (notmuch_filenames_valid (db_files)) - { + while (notmuch_filenames_valid (db_files)) { char *absolute = talloc_asprintf (state->removed_files, "%s/%s", path, notmuch_filenames_get (db_files)); + if (state->debug) + printf ("(D) add_files, pass 3: queuing leftover file %s for deletion from database\n", + absolute); _filename_list_add (state->removed_files, absolute); notmuch_filenames_move_to_next (db_files); } - while (notmuch_filenames_valid (db_subdirs)) - { + while (notmuch_filenames_valid (db_subdirs)) { char *absolute = talloc_asprintf (state->removed_directories, "%s/%s", path, notmuch_filenames_get (db_subdirs)); + if (state->debug) + printf ("(D) add_files, pass 3: queuing leftover directory %s for deletion from database\n", + absolute); + _filename_list_add (state->removed_directories, absolute); notmuch_filenames_move_to_next (db_subdirs); @@ -637,8 +771,6 @@ add_files (notmuch_database_t *notmuch, DONE: if (next) talloc_free (next); - if (dir) - closedir (dir); if (fs_entries) { for (i = 0; i < num_fs_entries; i++) free (fs_entries[i]); @@ -661,7 +793,7 @@ setup_progress_printing_timer (void) struct sigaction action; struct itimerval timerval; - /* Setup our handler for SIGALRM */ + /* Set up our handler for SIGALRM */ memset (&action, 0, sizeof (struct sigaction)); action.sa_handler = handle_sigalrm; sigemptyset (&action.sa_mask); @@ -717,21 +849,22 @@ count_files (const char *path, int *count, add_files_state_t *state) } for (i = 0; i < num_fs_entries && ! interrupted; i++) { - entry = fs_entries[i]; + entry = fs_entries[i]; /* Ignore special directories to avoid infinite recursion. - * Also ignore the .notmuch directory and files/directories - * the user has configured to be ignored. + * Also ignore the .notmuch directory. + */ + if (_special_directory (entry->d_name) || + strcmp (entry->d_name, ".notmuch") == 0) + continue; + + /* Ignore any files/directories the user has configured to be + * ignored */ - if (strcmp (entry->d_name, ".") == 0 || - strcmp (entry->d_name, "..") == 0 || - strcmp (entry->d_name, ".notmuch") == 0 || - _entry_in_ignore_list (entry->d_name, state)) - { - if (state->debug && _entry_in_ignore_list (entry->d_name, state)) + if (_entry_in_ignore_list (state, path, entry->d_name)) { + if (state->debug) printf ("(D) count_files: explicitly ignoring %s/%s\n", - path, - entry->d_name); + path, entry->d_name); continue; } @@ -761,7 +894,7 @@ count_files (const char *path, int *count, add_files_state_t *state) for (i = 0; i < num_fs_entries; i++) free (fs_entries[i]); - free (fs_entries); + free (fs_entries); } } @@ -799,6 +932,7 @@ remove_filename (notmuch_database_t *notmuch, { notmuch_status_t status; notmuch_message_t *message; + status = notmuch_database_begin_atomic (notmuch); if (status) return status; @@ -809,7 +943,7 @@ remove_filename (notmuch_database_t *notmuch, status = notmuch_database_remove_message (notmuch, path); if (status == NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID) { add_files_state->renamed_messages++; - if (add_files_state->synchronize_flags == TRUE) + if (add_files_state->synchronize_flags == true) notmuch_message_maildir_flags_to_tags (message); status = NOTMUCH_STATUS_SUCCESS; } else if (status == NOTMUCH_STATUS_SUCCESS) { @@ -830,19 +964,18 @@ _remove_directory (void *ctx, const char *path, add_files_state_t *add_files_state) { - notmuch_status_t status = NOTMUCH_STATUS_SUCCESS; + notmuch_status_t status; notmuch_directory_t *directory; notmuch_filenames_t *files, *subdirs; char *absolute; status = notmuch_database_get_directory (notmuch, path, &directory); - if (status || !directory) + if (status || ! directory) return status; for (files = notmuch_directory_get_child_files (directory); notmuch_filenames_valid (files); - notmuch_filenames_move_to_next (files)) - { + notmuch_filenames_move_to_next (files)) { absolute = talloc_asprintf (ctx, "%s/%s", path, notmuch_filenames_get (files)); status = remove_filename (notmuch, absolute, add_files_state); @@ -853,8 +986,7 @@ _remove_directory (void *ctx, for (subdirs = notmuch_directory_get_child_directories (directory); notmuch_filenames_valid (subdirs); - notmuch_filenames_move_to_next (subdirs)) - { + notmuch_filenames_move_to_next (subdirs)) { absolute = talloc_asprintf (ctx, "%s/%s", path, notmuch_filenames_get (subdirs)); status = _remove_directory (ctx, notmuch, absolute, add_files_state); @@ -863,8 +995,11 @@ _remove_directory (void *ctx, goto DONE; } + status = notmuch_directory_delete (directory); + DONE: - notmuch_directory_destroy (directory); + if (status) + notmuch_directory_destroy (directory); return status; } @@ -882,10 +1017,9 @@ print_results (const add_files_state_t *state) state->processed_files == 1 ? "file" : "total files"); notmuch_time_print_formatted_seconds (elapsed); if (elapsed > 1) - printf (" (%d files/sec.).\033[K\n", + printf (" (%d files/sec.)", (int) (state->processed_files / elapsed)); - else - printf (".\033[K\n"); + printf (".%s\n", (state->output_is_a_tty) ? "\033[K" : ""); } if (state->added_messages) @@ -909,7 +1043,12 @@ int notmuch_new_command (notmuch_config_t *config, int argc, char *argv[]) { notmuch_database_t *notmuch; - add_files_state_t add_files_state; + add_files_state_t add_files_state = { + .verbosity = VERBOSITY_NORMAL, + .debug = false, + .full_scan = false, + .output_is_a_tty = isatty (fileno (stdout)), + }; struct timeval tv_start; int ret = 0; struct stat st; @@ -918,27 +1057,29 @@ notmuch_new_command (notmuch_config_t *config, int argc, char *argv[]) struct sigaction action; _filename_node_t *f; int opt_index; - int i; - notmuch_bool_t timer_is_active = FALSE; - notmuch_bool_t no_hooks = FALSE; - notmuch_bool_t quiet = FALSE, verbose = FALSE; - - add_files_state.verbosity = VERBOSITY_NORMAL; - add_files_state.debug = FALSE; - add_files_state.output_is_a_tty = isatty (fileno (stdout)); + unsigned int i; + bool timer_is_active = false; + bool hooks = true; + bool quiet = false, verbose = false; + notmuch_status_t status; notmuch_opt_desc_t options[] = { - { NOTMUCH_OPT_BOOLEAN, &quiet, "quiet", 'q', 0 }, - { NOTMUCH_OPT_BOOLEAN, &verbose, "verbose", 'v', 0 }, - { NOTMUCH_OPT_BOOLEAN, &add_files_state.debug, "debug", 'd', 0 }, - { NOTMUCH_OPT_BOOLEAN, &no_hooks, "no-hooks", 'n', 0 }, - { 0, 0, 0, 0, 0 } + { .opt_bool = &quiet, .name = "quiet" }, + { .opt_bool = &verbose, .name = "verbose" }, + { .opt_bool = &add_files_state.debug, .name = "debug" }, + { .opt_bool = &add_files_state.full_scan, .name = "full-scan" }, + { .opt_bool = &hooks, .name = "hooks" }, + { .opt_inherit = notmuch_shared_indexing_options }, + { .opt_inherit = notmuch_shared_options }, + { } }; opt_index = parse_arguments (argc, argv, options, 1); if (opt_index < 0) return EXIT_FAILURE; + notmuch_process_shared_options (argv[0]); + /* quiet trumps verbose */ if (quiet) add_files_state.verbosity = VERBOSITY_QUIET; @@ -946,11 +1087,25 @@ notmuch_new_command (notmuch_config_t *config, int argc, char *argv[]) add_files_state.verbosity = VERBOSITY_VERBOSE; add_files_state.new_tags = notmuch_config_get_new_tags (config, &add_files_state.new_tags_length); - add_files_state.new_ignore = notmuch_config_get_new_ignore (config, &add_files_state.new_ignore_length); add_files_state.synchronize_flags = notmuch_config_get_maildir_synchronize_flags (config); db_path = notmuch_config_get_database_path (config); + add_files_state.db_path = db_path; + + if (! _setup_ignore (config, &add_files_state)) + return EXIT_FAILURE; - if (!no_hooks) { + for (i = 0; i < add_files_state.new_tags_length; i++) { + const char *error_msg; + + error_msg = illegal_tag (add_files_state.new_tags[i], false); + if (error_msg) { + fprintf (stderr, "Error: tag '%s' in new.tags: %s\n", + add_files_state.new_tags[i], error_msg); + return EXIT_FAILURE; + } + } + + if (hooks) { ret = notmuch_run_hook (db_path, "pre-new"); if (ret) return EXIT_FAILURE; @@ -972,20 +1127,61 @@ notmuch_new_command (notmuch_config_t *config, int argc, char *argv[]) return EXIT_FAILURE; add_files_state.total_files = count; } else { - if (notmuch_database_open (db_path, NOTMUCH_DATABASE_MODE_READ_WRITE, - ¬much)) + char *status_string = NULL; + if (notmuch_database_open_verbose (db_path, NOTMUCH_DATABASE_MODE_READ_WRITE, + ¬much, &status_string)) { + if (status_string) { + fputs (status_string, stderr); + free (status_string); + } return EXIT_FAILURE; + } + + notmuch_exit_if_unmatched_db_uuid (notmuch); if (notmuch_database_needs_upgrade (notmuch)) { - if (add_files_state.verbosity >= VERBOSITY_NORMAL) + time_t now = time (NULL); + struct tm *gm_time = gmtime (&now); + + /* 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); + + if (add_files_state.verbosity >= VERBOSITY_NORMAL) { printf ("Welcome to a new version of notmuch! Your database will now be upgraded.\n"); + printf ("This process is safe to interrupt.\n"); + printf ("Backing up tags to %s...\n", backup_name); + } + + if (notmuch_database_dump (notmuch, backup_name, "", + DUMP_FORMAT_BATCH_TAG, DUMP_INCLUDE_DEFAULT, true)) { + fprintf (stderr, "Backup failed. Aborting upgrade."); + return EXIT_FAILURE; + } + gettimeofday (&add_files_state.tv_start, NULL); - notmuch_database_upgrade (notmuch, - add_files_state.verbosity >= VERBOSITY_NORMAL ? upgrade_print_progress : NULL, - &add_files_state); + status = notmuch_database_upgrade ( + notmuch, + add_files_state.verbosity >= VERBOSITY_NORMAL ? upgrade_print_progress : NULL, + &add_files_state); + if (status) { + printf ("Upgrade failed: %s\n", + notmuch_status_to_string (status)); + notmuch_database_destroy (notmuch); + return EXIT_FAILURE; + } if (add_files_state.verbosity >= VERBOSITY_NORMAL) - printf ("Your notmuch database has now been upgraded to database format version %u.\n", - notmuch_database_get_version (notmuch)); + printf ("Your notmuch database has now been upgraded.\n"); } add_files_state.total_files = 0; @@ -994,7 +1190,14 @@ notmuch_new_command (notmuch_config_t *config, int argc, char *argv[]) if (notmuch == NULL) return EXIT_FAILURE; - /* Setup our handler for SIGINT. We do this after having + status = notmuch_process_shared_indexing_options (notmuch); + if (status != NOTMUCH_STATUS_SUCCESS) { + fprintf (stderr, "Error: Failed to process index options. (%s)\n", + notmuch_status_to_string (status)); + return EXIT_FAILURE; + } + + /* Set up our handler for SIGINT. We do this after having * potentially done a database upgrade we this interrupt handler * won't support. */ memset (&action, 0, sizeof (struct sigaction)); @@ -1006,9 +1209,6 @@ notmuch_new_command (notmuch_config_t *config, int argc, char *argv[]) talloc_free (dot_notmuch_path); dot_notmuch_path = NULL; - add_files_state.processed_files = 0; - add_files_state.added_messages = 0; - add_files_state.removed_messages = add_files_state.renamed_messages = 0; gettimeofday (&add_files_state.tv_start, NULL); add_files_state.removed_files = _filename_list_create (config); @@ -1018,7 +1218,7 @@ notmuch_new_command (notmuch_config_t *config, int argc, char *argv[]) if (add_files_state.verbosity == VERBOSITY_NORMAL && add_files_state.output_is_a_tty && ! debugger_is_active ()) { setup_progress_printing_timer (); - timer_is_active = TRUE; + timer_is_active = true; } ret = add_files (notmuch, db_path, &add_files_state); @@ -1026,33 +1226,32 @@ notmuch_new_command (notmuch_config_t *config, int argc, char *argv[]) goto DONE; gettimeofday (&tv_start, NULL); - for (f = add_files_state.removed_files->head; f && !interrupted; f = f->next) { + for (f = add_files_state.removed_files->head; f && ! interrupted; f = f->next) { ret = remove_filename (notmuch, f->filename, &add_files_state); if (ret) goto DONE; if (do_print_progress) { do_print_progress = 0; generic_print_progress ("Cleaned up", "messages", - tv_start, add_files_state.removed_messages + add_files_state.renamed_messages, - add_files_state.removed_files->count); + tv_start, add_files_state.removed_messages + add_files_state.renamed_messages, + add_files_state.removed_files->count); } } gettimeofday (&tv_start, NULL); - for (f = add_files_state.removed_directories->head, i = 0; f && !interrupted; f = f->next, i++) { + for (f = add_files_state.removed_directories->head, i = 0; f && ! interrupted; f = f->next, i++) { ret = _remove_directory (config, notmuch, f->filename, &add_files_state); if (ret) goto DONE; if (do_print_progress) { do_print_progress = 0; generic_print_progress ("Cleaned up", "directories", - tv_start, i, - add_files_state.removed_directories->count); + tv_start, i, + add_files_state.removed_directories->count); } } - for (f = add_files_state.directory_mtimes->head; f && !interrupted; f = f->next) { - notmuch_status_t status; + for (f = add_files_state.directory_mtimes->head; f && ! interrupted; f = f->next) { notmuch_directory_t *directory; status = notmuch_database_get_directory (notmuch, f->filename, &directory); if (status == NOTMUCH_STATUS_SUCCESS && directory) { @@ -1078,8 +1277,14 @@ notmuch_new_command (notmuch_config_t *config, int argc, char *argv[]) notmuch_database_destroy (notmuch); - if (!no_hooks && !ret && !interrupted) + if (hooks && ! ret && ! interrupted) ret = notmuch_run_hook (db_path, "post-new"); - return ret || interrupted ? EXIT_FAILURE : EXIT_SUCCESS; + if (ret || interrupted) + return EXIT_FAILURE; + + if (add_files_state.vanished_files) + return NOTMUCH_EXIT_TEMPFAIL; + + return EXIT_SUCCESS; }