} _filename_node_t;
typedef struct _filename_list {
+ unsigned count;
_filename_node_t *head;
_filename_node_t **tail;
} _filename_list_t;
_filename_list_t *message_ids_to_sync;
} add_files_state_t;
-static volatile sig_atomic_t do_add_files_print_progress = 0;
+static volatile sig_atomic_t do_print_progress = 0;
static void
handle_sigalrm (unused (int signal))
{
- do_add_files_print_progress = 1;
+ do_print_progress = 1;
}
static volatile sig_atomic_t interrupted;
static void
handle_sigint (unused (int sig))
{
- ssize_t ignored;
static char msg[] = "Stopping... \n";
- ignored = write(2, msg, sizeof(msg)-1);
+ write(2, msg, sizeof(msg)-1);
interrupted = 1;
}
list->head = NULL;
list->tail = &list->head;
+ list->count = 0;
return list;
}
{
_filename_node_t *node = talloc (list, _filename_node_t);
+ list->count++;
+
node->filename = talloc_strdup (list, filename);
node->next = NULL;
}
static void
-add_files_print_progress (add_files_state_t *state)
+generic_print_progress (const char *action, const char *object,
+ struct timeval tv_start, unsigned processed, unsigned total)
{
struct timeval tv_now;
double elapsed_overall, rate_overall;
gettimeofday (&tv_now, NULL);
- elapsed_overall = notmuch_time_elapsed (state->tv_start, tv_now);
- rate_overall = (state->processed_files) / elapsed_overall;
-
- printf ("Processed %d", state->processed_files);
+ elapsed_overall = notmuch_time_elapsed (tv_start, tv_now);
+ rate_overall = processed / elapsed_overall;
- if (state->total_files) {
- double time_remaining;
+ printf ("%s %d ", action, processed);
- time_remaining = ((state->total_files - state->processed_files) /
- rate_overall);
- printf (" of %d files (", state->total_files);
- notmuch_time_print_formatted_seconds (time_remaining);
- printf (" remaining). \r");
+ if (total) {
+ printf ("of %d %s", total, object);
+ if (processed > 0 && elapsed_overall > 0.5) {
+ double time_remaining = ((total - processed) / rate_overall);
+ printf (" (");
+ notmuch_time_print_formatted_seconds (time_remaining);
+ printf (" remaining)");
+ }
} else {
- printf (" files (%d files/sec.) \r", (int) rate_overall);
+ printf ("%s", object);
+ if (elapsed_overall > 0.5)
+ printf (" (%d %s/sec.)", (int) rate_overall, object);
}
+ printf (".\033[K\r");
fflush (stdout);
}
*
* o Ask the filesystem for files and directories within 'path'
* (via scandir and stored in fs_entries)
- * o Ask the database for files and directories within 'path'
- * (db_files and db_subdirs)
*
* o Pass 1: For each directory in fs_entries, recursively call into
* this same function.
*
- * o Pass 2: If 'fs_mtime' > 'db_mtime', then walk fs_entries
- * simultaneously with db_files and db_subdirs. Look for one of
- * three interesting cases:
+ * o Compare fs_mtime to db_mtime. If they are equivalent, terminate
+ * the algorithm at this point, (this directory has not been
+ * updated in the filesystem since the last database scan of PASS
+ * 2).
+ *
+ * o Ask the database for files and directories within 'path'
+ * (db_files and db_subdirs)
+ *
+ * o Pass 2: Walk fs_entries simultaneously with db_files and
+ * db_subdirs. Look for one of three interesting cases:
*
* 1. Regular file in fs_entries and not in db_files
* This is a new file to add_message into the database.
directory = notmuch_database_get_directory (notmuch, path);
db_mtime = notmuch_directory_get_mtime (directory);
- if (db_mtime == 0) {
- new_directory = TRUE;
- db_files = NULL;
- db_subdirs = NULL;
- } else {
- new_directory = FALSE;
- db_files = notmuch_directory_get_child_files (directory);
- db_subdirs = notmuch_directory_get_child_directories (directory);
- }
+ new_directory = db_mtime ? FALSE : TRUE;
/* If the database knows about this directory, then we sort based
* on strcmp to match the database sorting. Otherwise, we can do
if (fs_mtime == db_mtime)
goto DONE;
+ /* new_directory means a directory that the database has never
+ * seen before. In that case, we can simply leave db_files and
+ * db_subdirs NULL. */
+ if (!new_directory) {
+ db_files = notmuch_directory_get_child_files (directory);
+ db_subdirs = notmuch_directory_get_child_directories (directory);
+ }
+
/* Pass 2: Scan for new files, removed files, and removed directories. */
for (i = 0; i < num_fs_entries; i++)
{
/* 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);
- /* Defer sync of maildir flags until after old filenames
- * are removed in the case of a rename. */
if (state->synchronize_flags == TRUE)
- _filename_list_add (state->message_ids_to_sync,
- notmuch_message_get_message_id (message));
+ notmuch_message_maildir_flags_to_tags (message);
+ notmuch_message_thaw (message);
break;
/* Non-fatal issues (go on to next file) */
case NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID:
message = NULL;
}
- if (do_add_files_print_progress) {
- do_add_files_print_progress = 0;
- add_files_print_progress (state);
+ if (do_print_progress) {
+ do_print_progress = 0;
+ generic_print_progress ("Processed", "files", state->tv_start,
+ state->processed_files, state->total_files);
}
talloc_free (next);
return ret;
}
+static void
+setup_progress_printing_timer (void)
+{
+ struct sigaction action;
+ struct itimerval timerval;
+
+ /* 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);
+}
+
+static void
+stop_progress_printing_timer (void)
+{
+ struct sigaction action;
+ struct itimerval timerval;
+
+ /* 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);
+}
+
+
/* 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. */
+ * of error checks and then calls into the recursive function. */
static notmuch_status_t
add_files (notmuch_database_t *notmuch,
const char *path,
add_files_state_t *state)
{
notmuch_status_t status;
- struct sigaction action;
- struct itimerval timerval;
- notmuch_bool_t timer_is_active = FALSE;
struct stat st;
- 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;
- }
-
if (stat (path, &st)) {
fprintf (stderr, "Error reading directory %s: %s\n",
path, strerror (errno));
status = add_files_recursive (notmuch, path, state);
- 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;
}
notmuch_database_t *notmuch;
add_files_state_t add_files_state;
double elapsed;
- struct timeval tv_now;
+ struct timeval tv_now, tv_start;
int ret = 0;
struct stat st;
const char *db_path;
int renamed_files, removed_files;
notmuch_status_t status;
int i;
+ notmuch_bool_t timer_is_active = FALSE;
add_files_state.verbose = 0;
add_files_state.output_is_a_tty = isatty (fileno (stdout));
return 1;
}
}
-
config = notmuch_config_open (ctx, NULL, NULL);
if (config == NULL)
return 1;
add_files_state.removed_files = _filename_list_create (ctx);
add_files_state.removed_directories = _filename_list_create (ctx);
+ if (! debugger_is_active () && add_files_state.output_is_a_tty
+ && ! add_files_state.verbose) {
+ setup_progress_printing_timer ();
+ timer_is_active = TRUE;
+ }
+
ret = add_files (notmuch, db_path, &add_files_state);
removed_files = 0;
renamed_files = 0;
+ gettimeofday (&tv_start, NULL);
for (f = add_files_state.removed_files->head; f; f = f->next) {
status = notmuch_database_remove_message (notmuch, f->filename);
if (status == NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID)
renamed_files++;
else
removed_files++;
+ if (do_print_progress) {
+ do_print_progress = 0;
+ generic_print_progress ("Cleaned up", "messages",
+ tv_start, removed_files + renamed_files,
+ add_files_state.removed_files->count);
+ }
}
- for (f = add_files_state.removed_directories->head; f; f = f->next) {
+ gettimeofday (&tv_start, NULL);
+ for (f = add_files_state.removed_directories->head, i = 0; f; f = f->next, i++) {
_remove_directory (ctx, notmuch, f->filename,
&renamed_files, &removed_files);
+ if (do_print_progress) {
+ do_print_progress = 0;
+ generic_print_progress ("Cleaned up", "directories",
+ tv_start, i,
+ add_files_state.removed_directories->count);
+ }
}
talloc_free (add_files_state.removed_files);
/* Now that removals are done (hence the database is aware of all
* renames), we can synchronize maildir_flags to tags for all
* messages that had new filenames appear on this run. */
+ gettimeofday (&tv_start, NULL);
if (add_files_state.synchronize_flags) {
_filename_node_t *node;
notmuch_message_t *message;
- for (node = add_files_state.message_ids_to_sync->head;
+ for (node = add_files_state.message_ids_to_sync->head, i = 0;
node;
- node = node->next)
+ node = node->next, i++)
{
message = notmuch_database_find_message (notmuch, node->filename);
notmuch_message_maildir_flags_to_tags (message);
notmuch_message_destroy (message);
+ if (do_print_progress) {
+ do_print_progress = 0;
+ generic_print_progress (
+ "Synchronized tags for", "messages",
+ tv_start, i, add_files_state.message_ids_to_sync->count);
+ }
}
}
talloc_free (add_files_state.message_ids_to_sync);
add_files_state.message_ids_to_sync = NULL;
+ if (timer_is_active)
+ stop_progress_printing_timer ();
+
gettimeofday (&tv_now, NULL);
elapsed = notmuch_time_elapsed (add_files_state.tv_start,
tv_now);
"file" : "total files");
notmuch_time_print_formatted_seconds (elapsed);
if (elapsed > 1) {
- printf (" (%d files/sec.). \n",
+ printf (" (%d files/sec.).\033[K\n",
(int) (add_files_state.processed_files / elapsed));
} else {
- printf (". \n");
+ printf (".\033[K\n");
}
}
projects / notmuch / blobdiff