X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-new.c;h=6df4ad9f3dee001c21fa0fea5a091cb53a9bf8e7;hp=1b0558486b400b74609c811d7eb8188ebe17700a;hb=2ce46c31fe44ea1c7fc75a7da83e1278d06c28e1;hpb=5939490f64ec08e931e263d1dfe5b33c3f442d26 diff --git a/notmuch-new.c b/notmuch-new.c index 1b055848..6df4ad9f 100644 --- a/notmuch-new.c +++ b/notmuch-new.c @@ -20,6 +20,18 @@ #include "notmuch-client.h" +#include + +typedef struct { + int output_is_a_tty; + int verbose; + + int total_files; + int processed_files; + int added_messages; + struct timeval tv_start; +} add_files_state_t; + static volatile sig_atomic_t do_add_files_print_progress = 0; static void @@ -33,8 +45,10 @@ static volatile sig_atomic_t interrupted; static void handle_sigint (unused (int sig)) { + ssize_t ignored; static char msg[] = "Stopping... \n"; - write(2, msg, sizeof(msg)-1); + + ignored = write(2, msg, sizeof(msg)-1); interrupted = 1; } @@ -78,22 +92,49 @@ static int ino_cmp(const struct dirent **a, const struct dirent **b) return ((*a)->d_ino < (*b)->d_ino) ? -1 : 1; } +/* Test if the directory looks like a Maildir directory. + * + * Search through the array of directory entries to see if we can find all + * three subdirectories typical for Maildir, that is "new", "cur", and "tmp". + * + * Return 1 if the directory looks like a Maildir and 0 otherwise. + */ +static int +is_maildir (struct dirent **entries, int count) +{ + int i, found = 0; + + for (i = 0; i < count; i++) { + if (entries[i]->d_type != DT_DIR) continue; + 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; + } + } + + return 0; +} + /* Examine 'path' recursively as follows: * - * o Ask the filesystem for the mtime of 'path' (path_mtime) + * o Ask the filesystem for the mtime of 'path' (fs_mtime) * - * o Ask the database for its timestamp of 'path' (path_dbtime) + * o Ask the database for its timestamp of 'path' (db_mtime) * - * o If 'path_mtime' > 'path_dbtime' + * o If 'fs_mtime' > 'db_mtime' * * o For each regular file in 'path' with mtime newer than the - * 'path_dbtime' call add_message to add the file to the + * 'db_mtime' call add_message to add the file to the * database. * - * o For each sub-directory of path, recursively call into this - * same function. + * o For each sub-directory of path, recursively call into this + * same function. * - * o Tell the database to update its time of 'path' to 'path_mtime' + * o Tell the database to update its time of 'path' to 'fs_mtime' * * The 'struct stat *st' must point to a structure that has already * been initialized for 'path' by calling stat(). @@ -107,26 +148,18 @@ add_files_recursive (notmuch_database_t *notmuch, DIR *dir = NULL; struct dirent *entry = NULL; char *next = NULL; - time_t path_mtime, path_dbtime; + time_t fs_mtime, db_mtime; notmuch_status_t status, ret = NOTMUCH_STATUS_SUCCESS; notmuch_message_t *message = NULL; struct dirent **namelist = NULL; int num_entries; + notmuch_directory_t *directory; - /* If we're told to, we bail out on encountering a read-only - * directory, (with this being a clear clue from the user to - * Notmuch that new mail won't be arriving there and we need not - * look. */ - if (state->ignore_read_only_directories && - (st->st_mode & S_IWUSR) == 0) - { - state->saw_read_only_directory = TRUE; - goto DONE; - } + fs_mtime = st->st_mtime; - path_mtime = st->st_mtime; + directory = notmuch_database_get_directory (notmuch, path); + db_mtime = notmuch_directory_get_mtime (directory); - path_dbtime = notmuch_database_get_timestamp (notmuch, path); num_entries = scandir (path, &namelist, 0, ino_cmp); if (num_entries == -1) { @@ -147,7 +180,7 @@ add_files_recursive (notmuch_database_t *notmuch, /* If this directory hasn't been modified since the last * add_files, then we only need to look further for * sub-directories. */ - if (path_mtime <= path_dbtime && entry->d_type != DT_DIR) + if (fs_mtime <= db_mtime && entry->d_type == DT_REG) continue; /* Ignore special directories to avoid infinite recursion. @@ -157,6 +190,9 @@ add_files_recursive (notmuch_database_t *notmuch, * user specify files to be ignored. */ if (strcmp (entry->d_name, ".") == 0 || strcmp (entry->d_name, "..") == 0 || + (entry->d_type == DT_DIR && + (strcmp (entry->d_name, "tmp") == 0) && + is_maildir (namelist, num_entries)) || strcmp (entry->d_name, ".notmuch") ==0) { continue; @@ -165,18 +201,42 @@ add_files_recursive (notmuch_database_t *notmuch, next = talloc_asprintf (notmuch, "%s/%s", path, entry->d_name); if (stat (next, st)) { + int err = errno; + + switch (err) { + case ENOENT: + /* The file was removed between scandir and now... */ + case EPERM: + case EACCES: + /* We can't read this file so don't add it to the cache. */ + continue; + } + fprintf (stderr, "Error reading %s: %s\n", next, strerror (errno)); ret = NOTMUCH_STATUS_FILE_ERROR; - continue; + goto DONE; } if (S_ISREG (st->st_mode)) { /* If the file hasn't been modified since the last * add_files, then we need not look at it. */ - if (path_dbtime == 0 || st->st_mtime > path_dbtime) { + if (db_mtime == 0 || st->st_mtime > db_mtime) { state->processed_files++; + if (state->verbose) { + if (state->output_is_a_tty) + printf("\r\033[K"); + + printf ("%i/%i: %s", + state->processed_files, + state->total_files, + next); + + putchar((state->output_is_a_tty) ? '\r' : '\n'); + fflush (stdout); + } + status = notmuch_database_add_message (notmuch, next, &message); switch (status) { /* success */ @@ -193,6 +253,7 @@ add_files_recursive (notmuch_database_t *notmuch, next); break; /* Fatal issues. Don't process anymore. */ + case NOTMUCH_STATUS_READONLY_DATABASE: case NOTMUCH_STATUS_XAPIAN_EXCEPTION: case NOTMUCH_STATUS_OUT_OF_MEMORY: fprintf (stderr, "Error: %s. Halting processing.\n", @@ -229,9 +290,11 @@ add_files_recursive (notmuch_database_t *notmuch, next = NULL; } - status = notmuch_database_set_timestamp (notmuch, path, path_mtime); - if (status && ret == NOTMUCH_STATUS_SUCCESS) - ret = status; + if (! interrupted) { + status = notmuch_directory_set_mtime (directory, fs_mtime); + if (status && ret == NOTMUCH_STATUS_SUCCESS) + ret = status; + } DONE: if (next) @@ -249,7 +312,7 @@ add_files_recursive (notmuch_database_t *notmuch, /* This is the top-level entry point for add_files. It does a couple * of error checks, sets up the progress-printing timer and then calls * into the recursive function. */ -notmuch_status_t +static notmuch_status_t add_files (notmuch_database_t *notmuch, const char *path, add_files_state_t *state) @@ -258,6 +321,7 @@ add_files (notmuch_database_t *notmuch, notmuch_status_t status; struct sigaction action; struct itimerval timerval; + notmuch_bool_t timer_is_active = FALSE; if (stat (path, &st)) { fprintf (stderr, "Error reading directory %s: %s\n", @@ -270,32 +334,38 @@ add_files (notmuch_database_t *notmuch, return NOTMUCH_STATUS_FILE_ERROR; } - /* Setup our handler for SIGALRM */ - memset (&action, 0, sizeof (struct sigaction)); - action.sa_handler = handle_sigalrm; - sigemptyset (&action.sa_mask); - action.sa_flags = SA_RESTART; - sigaction (SIGALRM, &action, NULL); - - /* Then start a timer to send SIGALRM once per second. */ - timerval.it_interval.tv_sec = 1; - timerval.it_interval.tv_usec = 0; - timerval.it_value.tv_sec = 1; - timerval.it_value.tv_usec = 0; - setitimer (ITIMER_REAL, &timerval, NULL); + if (state->output_is_a_tty && ! debugger_is_active () && ! state->verbose) { + /* Setup our handler for SIGALRM */ + memset (&action, 0, sizeof (struct sigaction)); + action.sa_handler = handle_sigalrm; + sigemptyset (&action.sa_mask); + action.sa_flags = SA_RESTART; + sigaction (SIGALRM, &action, NULL); + + /* Then start a timer to send SIGALRM once per second. */ + timerval.it_interval.tv_sec = 1; + timerval.it_interval.tv_usec = 0; + timerval.it_value.tv_sec = 1; + timerval.it_value.tv_usec = 0; + setitimer (ITIMER_REAL, &timerval, NULL); + + timer_is_active = TRUE; + } status = add_files_recursive (notmuch, path, &st, state); - /* Now stop the timer. */ - timerval.it_interval.tv_sec = 0; - timerval.it_interval.tv_usec = 0; - timerval.it_value.tv_sec = 0; - timerval.it_value.tv_usec = 0; - setitimer (ITIMER_REAL, &timerval, NULL); - - /* And disable the signal handler. */ - action.sa_handler = SIG_IGN; - sigaction (SIGALRM, &action, NULL); + if (timer_is_active) { + /* Now stop the timer. */ + timerval.it_interval.tv_sec = 0; + timerval.it_interval.tv_usec = 0; + timerval.it_value.tv_sec = 0; + timerval.it_value.tv_usec = 0; + setitimer (ITIMER_REAL, &timerval, NULL); + + /* And disable the signal handler. */ + action.sa_handler = SIG_IGN; + sigaction (SIGALRM, &action, NULL); + } return status; } @@ -370,8 +440,7 @@ count_files (const char *path, int *count) } int -notmuch_new_command (void *ctx, - unused (int argc), unused (char *argv[])) +notmuch_new_command (void *ctx, int argc, char *argv[]) { notmuch_config_t *config; notmuch_database_t *notmuch; @@ -383,6 +452,19 @@ notmuch_new_command (void *ctx, const char *db_path; char *dot_notmuch_path; struct sigaction action; + int i; + + add_files_state.verbose = 0; + add_files_state.output_is_a_tty = isatty (fileno (stdout)); + + for (i = 0; i < argc && argv[i][0] == '-'; i++) { + if (STRNCMP_LITERAL (argv[i], "--verbose") == 0) { + add_files_state.verbose = 1; + } else { + fprintf (stderr, "Unrecognized option: %s\n", argv[i]); + return 1; + } + } /* Setup our handler for SIGINT */ memset (&action, 0, sizeof (struct sigaction)); @@ -407,13 +489,12 @@ notmuch_new_command (void *ctx, if (interrupted) return 1; - printf ("Found %d total files. \n", count); + printf ("Found %d total files (that's not much mail).\n", count); notmuch = notmuch_database_create (db_path); - add_files_state.ignore_read_only_directories = FALSE; add_files_state.total_files = count; } else { - notmuch = notmuch_database_open (db_path); - add_files_state.ignore_read_only_directories = TRUE; + notmuch = notmuch_database_open (db_path, + NOTMUCH_DATABASE_MODE_READ_WRITE); add_files_state.total_files = 0; } @@ -423,7 +504,6 @@ notmuch_new_command (void *ctx, talloc_free (dot_notmuch_path); dot_notmuch_path = NULL; - add_files_state.saw_read_only_directory = FALSE; add_files_state.processed_files = 0; add_files_state.added_messages = 0; gettimeofday (&add_files_state.tv_start, NULL); @@ -446,19 +526,12 @@ notmuch_new_command (void *ctx, } } if (add_files_state.added_messages) { - printf ("Added %d new %s to the database (not much, really).\n", + printf ("Added %d new %s to the database.\n", add_files_state.added_messages, add_files_state.added_messages == 1 ? "message" : "messages"); } else { - printf ("No new mail---and that's not much.\n"); - } - - if (elapsed > 1 && ! add_files_state.saw_read_only_directory) { - printf ("\nTip: If you have any sub-directories that are archives (that is,\n" - "they will never receive new mail), marking these directories as\n" - "read-only (chmod u-w /path/to/dir) will make \"notmuch new\"\n" - "much more efficient (it won't even look in those directories).\n"); + printf ("No new mail.\n"); } if (ret) {