diff options
| -rw-r--r-- | notmuch-client.h | 1 | ||||
| -rw-r--r-- | notmuch-new.c | 31 | ||||
| -rw-r--r-- | notmuch.c | 11 |
3 files changed, 36 insertions, 7 deletions
diff --git a/notmuch-client.h b/notmuch-client.h index ea776860..f105c8b2 100644 --- a/notmuch-client.h +++ b/notmuch-client.h @@ -74,6 +74,7 @@ typedef void (*add_files_callback_t) (notmuch_message_t *message); typedef struct { int ignore_read_only_directories; int saw_read_only_directory; + int verbose; int total_files; int processed_files; diff --git a/notmuch-new.c b/notmuch-new.c index 0dd27844..a2b30bdc 100644 --- a/notmuch-new.c +++ b/notmuch-new.c @@ -179,6 +179,14 @@ add_files_recursive (notmuch_database_t *notmuch, if (path_dbtime == 0 || st->st_mtime > path_dbtime) { state->processed_files++; + if (state->verbose) { + printf ("\r\033[K%i/%i: %s\r", + state->processed_files, + state->total_files, + next); + fflush (stdout); + } + status = notmuch_database_add_message (notmuch, next, &message); switch (status) { /* success */ @@ -274,8 +282,10 @@ add_files (notmuch_database_t *notmuch, return NOTMUCH_STATUS_FILE_ERROR; } - /* Setup our handler for SIGALRM */ - if (isatty (fileno (stdout)) && ! debugger_is_active ()) { + if (isatty (fileno (stdout)) && ! 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); @@ -294,8 +304,8 @@ add_files (notmuch_database_t *notmuch, status = add_files_recursive (notmuch, path, &st, state); - /* Now stop the timer. */ 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; @@ -380,8 +390,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; @@ -393,6 +402,18 @@ notmuch_new_command (void *ctx, const char *db_path; char *dot_notmuch_path; struct sigaction action; + int i; + + add_files_state.verbose = 0; + + 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)); @@ -107,8 +107,8 @@ command_t commands[] = { "\t\tInvoking notmuch with no command argument will run setup if\n" "\t\tthe setup command has not previously been completed." }, { "new", notmuch_new_command, - NULL, - "Find and import new messages to the notmuch database.", + "[--verbose]", + "\t\tFind and import new messages to the notmuch database.", "\t\tScans all sub-directories of the mail directory, performing\n" "\t\tfull-text indexing on new messages that are found. Each new\n" "\t\tmessage will be tagged as both \"inbox\" and \"unread\".\n" @@ -122,6 +122,13 @@ command_t commands[] = { "\t\tis delivered and you wish to incorporate it into the database.\n" "\t\tThese subsequent runs will be much quicker than the initial run.\n" "\n" + "\t\tSupported options for new include:\n" + "\n" + "\t\t--verbose\n" + "\n" + "\t\t\tVerbose operation. Shows paths of message files as\n" + "\t\t\tthey are being indexed.\n" + "\n" "\t\tNote: \"notmuch new\" runs (other than the first run) will\n" "\t\tskip any read-only directories, so you can use that to mark\n" "\t\tdirectories that will not receive any new mail (and make\n" |