typedef struct _filename_node {
char *filename;
+ time_t mtime;
struct _filename_node *next;
} _filename_node_t;
int total_files;
int processed_files;
- int added_messages;
+ int added_messages, removed_messages, renamed_messages;
struct timeval tv_start;
_filename_list_t *removed_files;
_filename_list_t *removed_directories;
+ _filename_list_t *directory_mtimes;
notmuch_bool_t synchronize_flags;
- _filename_list_t *message_ids_to_sync;
} add_files_state_t;
static volatile sig_atomic_t do_print_progress = 0;
{
static char msg[] = "Stopping... \n";
- write(2, msg, sizeof(msg)-1);
+ /* This write is "opportunistic", so it's okay to ignore the
+ * 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));
interrupted = 1;
}
return list;
}
-static void
+static _filename_node_t *
_filename_list_add (_filename_list_t *list,
const char *filename)
{
*(list->tail) = node;
list->tail = &node->next;
+
+ return node;
}
static void
new_directory = db_mtime ? FALSE : TRUE;
+ /* XXX This is a temporary workaround. If we don't update the
+ * database mtime until after processing messages in this
+ * directory, then a 0 mtime is *not* sufficient to indicate that
+ * this directory has no messages or subdirs in the database (for
+ * example, if an earlier run skipped the mtime update because
+ * fs_mtime == stat_time, or was interrupted before updating the
+ * mtime at the end). To address this, we record a (bogus)
+ * non-zero value before processing any child messages so that a
+ * later run won't mistake this for a new directory (and, for
+ * example, fail to detect removed files and subdirs).
+ *
+ * A better solution would be for notmuch_database_get_directory
+ * to indicate if it really created a new directory or not, either
+ * by a new out-argument, or by recording this information and
+ * providing an accessor.
+ */
+ if (new_directory)
+ notmuch_directory_set_mtime (directory, -1);
+
/* If the database knows about this directory, then we sort based
* on strcmp to match the database sorting. Otherwise, we can do
* inode-based sorting for faster filesystem operation. */
fflush (stdout);
}
+ status = notmuch_database_begin_atomic (notmuch);
+ if (status) {
+ ret = status;
+ goto DONE;
+ }
+
status = notmuch_database_add_message (notmuch, next, &message);
switch (status) {
/* success */
break;
/* Non-fatal issues (go on to next file) */
case NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID:
- /* 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);
break;
case NOTMUCH_STATUS_FILE_NOT_EMAIL:
fprintf (stderr, "Note: Ignoring non-mail file: %s\n",
case NOTMUCH_STATUS_NULL_POINTER:
case NOTMUCH_STATUS_TAG_TOO_LONG:
case NOTMUCH_STATUS_UNBALANCED_FREEZE_THAW:
+ case NOTMUCH_STATUS_UNBALANCED_ATOMIC:
case NOTMUCH_STATUS_LAST_STATUS:
INTERNAL_ERROR ("add_message returned unexpected value: %d", status);
goto DONE;
}
+ status = notmuch_database_end_atomic (notmuch);
+ if (status) {
+ ret = status;
+ goto DONE;
+ }
+
if (message) {
notmuch_message_destroy (message);
message = NULL;
* when we stat'ed the directory, we skip updating the mtime in
* the database because a message could be delivered later in this
* same second. This may lead to unnecessary re-scans, but it
- * avoids overlooking messages.
- *
- * XXX Bug workaround: If this is a new directory, we *must*
- * update the mtime; otherwise the next run will see the 0 mtime
- * and think this is still a new directory containing no files or
- * subdirs (which is unsound in general). If fs_mtime ==
- * stat_time, we set the database mtime to a bogus (but non-zero!)
- * value to force a rescan.
- */
- if (new_directory && fs_mtime == stat_time)
- fs_mtime = 1;
- if (! interrupted && fs_mtime != stat_time) {
- status = notmuch_directory_set_mtime (directory, fs_mtime);
- if (status && ret == NOTMUCH_STATUS_SUCCESS)
- ret = status;
- }
+ * avoids overlooking messages. */
+ if (fs_mtime != stat_time)
+ _filename_list_add (state->directory_mtimes, path)->mtime = fs_mtime;
DONE:
if (next)
fflush (stdout);
}
+/* Remove one message filename from the database. */
+static notmuch_status_t
+remove_filename (notmuch_database_t *notmuch,
+ const char *path,
+ add_files_state_t *add_files_state)
+{
+ notmuch_status_t status;
+ notmuch_message_t *message;
+ status = notmuch_database_begin_atomic (notmuch);
+ if (status)
+ return status;
+ status = notmuch_database_find_message_by_filename (notmuch, path, &message);
+ if (status || message == NULL)
+ return status;
+ 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)
+ notmuch_message_maildir_flags_to_tags (message);
+ } else
+ add_files_state->removed_messages++;
+ notmuch_message_destroy (message);
+ notmuch_database_end_atomic (notmuch);
+ return status;
+}
+
/* Recursively remove all filenames from the database referring to
* 'path' (or to any of its children). */
static void
_remove_directory (void *ctx,
notmuch_database_t *notmuch,
const char *path,
- int *renamed_files,
- int *removed_files)
+ add_files_state_t *add_files_state)
{
notmuch_directory_t *directory;
notmuch_filenames_t *files, *subdirs;
- notmuch_status_t status;
char *absolute;
directory = notmuch_database_get_directory (notmuch, path);
{
absolute = talloc_asprintf (ctx, "%s/%s", path,
notmuch_filenames_get (files));
- status = notmuch_database_remove_message (notmuch, absolute);
- if (status == NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID)
- *renamed_files = *renamed_files + 1;
- else
- *removed_files = *removed_files + 1;
+ remove_filename (notmuch, absolute, add_files_state);
talloc_free (absolute);
}
{
absolute = talloc_asprintf (ctx, "%s/%s", path,
notmuch_filenames_get (subdirs));
- _remove_directory (ctx, notmuch, absolute, renamed_files, removed_files);
+ _remove_directory (ctx, notmuch, absolute, add_files_state);
talloc_free (absolute);
}
char *dot_notmuch_path;
struct sigaction action;
_filename_node_t *f;
- int renamed_files, removed_files;
- notmuch_status_t status;
int i;
notmuch_bool_t timer_is_active = FALSE;
+ notmuch_bool_t run_hooks = TRUE;
add_files_state.verbose = 0;
add_files_state.output_is_a_tty = isatty (fileno (stdout));
+ argc--; argv++; /* skip subcommand argument */
+
for (i = 0; i < argc && argv[i][0] == '-'; i++) {
if (STRNCMP_LITERAL (argv[i], "--verbose") == 0) {
add_files_state.verbose = 1;
+ } else if (strcmp (argv[i], "--no-hooks") == 0) {
+ run_hooks = FALSE;
} else {
fprintf (stderr, "Unrecognized option: %s\n", argv[i]);
return 1;
add_files_state.new_tags = notmuch_config_get_new_tags (config, &add_files_state.new_tags_length);
add_files_state.synchronize_flags = notmuch_config_get_maildir_synchronize_flags (config);
- add_files_state.message_ids_to_sync = _filename_list_create (ctx);
db_path = notmuch_config_get_database_path (config);
+ if (run_hooks) {
+ ret = notmuch_run_hook (db_path, "pre-new");
+ if (ret)
+ return ret;
+ }
+
dot_notmuch_path = talloc_asprintf (ctx, "%s/%s", db_path, ".notmuch");
if (stat (dot_notmuch_path, &st)) {
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 (ctx);
add_files_state.removed_directories = _filename_list_create (ctx);
+ add_files_state.directory_mtimes = _filename_list_create (ctx);
if (! debugger_is_active () && add_files_state.output_is_a_tty
&& ! add_files_state.verbose) {
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++;
+ for (f = add_files_state.removed_files->head; f && !interrupted; f = f->next) {
+ remove_filename (notmuch, f->filename, &add_files_state);
if (do_print_progress) {
do_print_progress = 0;
generic_print_progress ("Cleaned up", "messages",
- tv_start, removed_files + renamed_files,
+ 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; f = f->next, i++) {
- _remove_directory (ctx, notmuch, f->filename,
- &renamed_files, &removed_files);
+ for (f = add_files_state.removed_directories->head, i = 0; f && !interrupted; f = f->next, i++) {
+ _remove_directory (ctx, notmuch, f->filename, &add_files_state);
if (do_print_progress) {
do_print_progress = 0;
generic_print_progress ("Cleaned up", "directories",
}
}
- talloc_free (add_files_state.removed_files);
- talloc_free (add_files_state.removed_directories);
-
- /* 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, i = 0;
- node;
- 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);
- }
+ for (f = add_files_state.directory_mtimes->head; f && !interrupted; f = f->next) {
+ notmuch_directory_t *directory;
+ directory = notmuch_database_get_directory (notmuch, f->filename);
+ if (directory) {
+ notmuch_directory_set_mtime (directory, f->mtime);
+ notmuch_directory_destroy (directory);
}
}
- talloc_free (add_files_state.message_ids_to_sync);
- add_files_state.message_ids_to_sync = NULL;
+ talloc_free (add_files_state.removed_files);
+ talloc_free (add_files_state.removed_directories);
+ talloc_free (add_files_state.directory_mtimes);
if (timer_is_active)
stop_progress_printing_timer ();
printf ("No new mail.");
}
- if (removed_files) {
+ if (add_files_state.removed_messages) {
printf (" Removed %d %s.",
- removed_files,
- removed_files == 1 ? "message" : "messages");
+ add_files_state.removed_messages,
+ add_files_state.removed_messages == 1 ? "message" : "messages");
}
- if (renamed_files) {
+ if (add_files_state.renamed_messages) {
printf (" Detected %d file %s.",
- renamed_files,
- renamed_files == 1 ? "rename" : "renames");
+ add_files_state.renamed_messages,
+ add_files_state.renamed_messages == 1 ? "rename" : "renames");
}
printf ("\n");
notmuch_database_close (notmuch);
+ if (run_hooks && !ret && !interrupted)
+ ret = notmuch_run_hook (db_path, "post-new");
+
return ret || interrupted;
}
projects / notmuch / blobdiff