X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-new.c;h=c4b7da38afe07ede1b998cd082298f9f2f75577a;hp=f0c306d58ba8edf55af84f1dd535781e19fad7d8;hb=7c450905e41d9bc81aca82f4593a5b42a4bb8e31;hpb=59c09623c844f095c14400a9b4199be20e5d712e diff --git a/notmuch-new.c b/notmuch-new.c index f0c306d5..c4b7da38 100644 --- a/notmuch-new.c +++ b/notmuch-new.c @@ -35,6 +35,8 @@ typedef struct _filename_list { typedef struct { int output_is_a_tty; int verbose; + const char **new_tags; + size_t new_tags_length; int total_files; int processed_files; @@ -43,6 +45,9 @@ typedef struct { _filename_list_t *removed_files; _filename_list_t *removed_directories; + + notmuch_bool_t synchronize_flags; + _filename_list_t *message_ids_to_sync; } add_files_state_t; static volatile sig_atomic_t do_add_files_print_progress = 0; @@ -93,13 +98,6 @@ _filename_list_add (_filename_list_t *list, list->tail = &node->next; } -static void -tag_inbox_and_unread (notmuch_message_t *message) -{ - notmuch_message_add_tag (message, "inbox"); - notmuch_message_add_tag (message, "unread"); -} - static void add_files_print_progress (add_files_state_t *state) { @@ -153,7 +151,7 @@ _entries_resemble_maildir (struct dirent **entries, int count) int i, found = 0; for (i = 0; i < count; i++) { - if (entries[i]->d_type != DT_DIR) + if (entries[i]->d_type != DT_DIR && entries[i]->d_type != DT_UNKNOWN) continue; if (strcmp(entries[i]->d_name, "new") == 0 || @@ -221,7 +219,8 @@ add_files_recursive (notmuch_database_t *notmuch, notmuch_filenames_t *db_files = NULL; notmuch_filenames_t *db_subdirs = NULL; struct stat st; - notmuch_bool_t is_maildir; + notmuch_bool_t is_maildir, new_directory; + const char **tag; if (stat (path, &st)) { fprintf (stderr, "Error reading directory %s: %s\n", @@ -240,12 +239,22 @@ add_files_recursive (notmuch_database_t *notmuch, 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); + } + /* 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. */ num_fs_entries = scandir (path, &fs_entries, 0, - db_mtime ? - dirent_sort_strcmp_name : dirent_sort_inode); + new_directory ? + dirent_sort_inode : dirent_sort_strcmp_name); if (num_fs_entries == -1) { fprintf (stderr, "Error opening directory %s: %s\n", @@ -263,8 +272,19 @@ add_files_recursive (notmuch_database_t *notmuch, entry = fs_entries[i]; - if (entry->d_type != DT_DIR && entry->d_type != DT_LNK) + /* We only want to descend into directories. + * But symlinks can be to directories too, of course. + * + * And if the filesystem doesn't tell us the file type in the + * scandir results, then it might be a directory (and if not, + * then we'll stat and return immediately in the next level of + * recursion). */ + if (entry->d_type != DT_DIR && + entry->d_type != DT_LNK && + entry->d_type != DT_UNKNOWN) + { continue; + } /* Ignore special directories to avoid infinite recursion. * Also ignore the .notmuch directory and any "tmp" directory @@ -288,15 +308,19 @@ add_files_recursive (notmuch_database_t *notmuch, next = NULL; } - /* If this directory hasn't been modified since the last - * "notmuch new", then we can skip the second pass entirely. */ - if (fs_mtime <= db_mtime) + /* If the directory's modification time in the filesystem is the + * same as what we recorded in the database the last time we + * scanned it, then we can skip the second pass entirely. + * + * We test for strict equality here to avoid a bug that can happen + * if the system clock jumps backward, (preventing new mail from + * being discovered until the clock catches up and the directory + * is modified again). + */ + if (fs_mtime == db_mtime) goto DONE; /* Pass 2: Scan for new files, removed files, and removed directories. */ - db_files = notmuch_directory_get_child_files (directory); - db_subdirs = notmuch_directory_get_child_directories (directory); - for (i = 0; i < num_fs_entries; i++) { if (interrupted) @@ -306,7 +330,7 @@ add_files_recursive (notmuch_database_t *notmuch, /* Check if we've walked past any names in db_files or * db_subdirs. If so, these have been deleted. */ - while (notmuch_filenames_has_more (db_files) && + while (notmuch_filenames_valid (db_files) && strcmp (notmuch_filenames_get (db_files), entry->d_name) < 0) { char *absolute = talloc_asprintf (state->removed_files, @@ -315,10 +339,10 @@ add_files_recursive (notmuch_database_t *notmuch, _filename_list_add (state->removed_files, absolute); - notmuch_filenames_advance (db_files); + notmuch_filenames_move_to_next (db_files); } - while (notmuch_filenames_has_more (db_subdirs) && + while (notmuch_filenames_valid (db_subdirs) && strcmp (notmuch_filenames_get (db_subdirs), entry->d_name) <= 0) { const char *filename = notmuch_filenames_get (db_subdirs); @@ -331,12 +355,18 @@ add_files_recursive (notmuch_database_t *notmuch, _filename_list_add (state->removed_directories, absolute); } - notmuch_filenames_advance (db_subdirs); + notmuch_filenames_move_to_next (db_subdirs); } /* If we're looking at a symlink, we only want to add it if it - * links to a regular file, (and not to a directory, say). */ - if (entry->d_type == DT_LNK) { + * links to a regular file, (and not to a directory, say). + * + * Similarly, if the file is of unknown type (due to filesytem + * limitations), then we also need to look closer. + * + * In either case, a stat does the trick. + */ + if (entry->d_type == DT_LNK || entry->d_type == DT_UNKNOWN) { int err; next = talloc_asprintf (notmuch, "%s/%s", path, entry->d_name); @@ -357,10 +387,10 @@ add_files_recursive (notmuch_database_t *notmuch, } /* Don't add a file that we've added before. */ - if (notmuch_filenames_has_more (db_files) && + if (notmuch_filenames_valid (db_files) && strcmp (notmuch_filenames_get (db_files), entry->d_name) == 0) { - notmuch_filenames_advance (db_files); + notmuch_filenames_move_to_next (db_files); continue; } @@ -388,18 +418,27 @@ add_files_recursive (notmuch_database_t *notmuch, /* success */ case NOTMUCH_STATUS_SUCCESS: state->added_messages++; - tag_inbox_and_unread (message); + notmuch_message_freeze (message); + for (tag=state->new_tags; *tag != NULL; tag++) + notmuch_message_add_tag (message, *tag); + if (state->synchronize_flags == TRUE) + 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: - /* Stay silent on this one. */ + /* 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)); break; case NOTMUCH_STATUS_FILE_NOT_EMAIL: fprintf (stderr, "Note: Ignoring non-mail file: %s\n", next); break; /* Fatal issues. Don't process anymore. */ - case NOTMUCH_STATUS_READONLY_DATABASE: + case NOTMUCH_STATUS_READ_ONLY_DATABASE: case NOTMUCH_STATUS_XAPIAN_EXCEPTION: case NOTMUCH_STATUS_OUT_OF_MEMORY: fprintf (stderr, "Error: %s. Halting processing.\n", @@ -430,9 +469,12 @@ add_files_recursive (notmuch_database_t *notmuch, next = NULL; } + if (interrupted) + goto DONE; + /* Now that we've walked the whole filesystem list, anything left * over in the database lists has been deleted. */ - while (notmuch_filenames_has_more (db_files)) + while (notmuch_filenames_valid (db_files)) { char *absolute = talloc_asprintf (state->removed_files, "%s/%s", path, @@ -440,10 +482,10 @@ add_files_recursive (notmuch_database_t *notmuch, _filename_list_add (state->removed_files, absolute); - notmuch_filenames_advance (db_files); + notmuch_filenames_move_to_next (db_files); } - while (notmuch_filenames_has_more (db_subdirs)) + while (notmuch_filenames_valid (db_subdirs)) { char *absolute = talloc_asprintf (state->removed_directories, "%s/%s", path, @@ -451,7 +493,7 @@ add_files_recursive (notmuch_database_t *notmuch, _filename_list_add (state->removed_directories, absolute); - notmuch_filenames_advance (db_subdirs); + notmuch_filenames_move_to_next (db_subdirs); } if (! interrupted) { @@ -609,6 +651,75 @@ count_files (const char *path, int *count) free (fs_entries); } +static void +upgrade_print_progress (void *closure, + double progress) +{ + add_files_state_t *state = closure; + + printf ("Upgrading database: %.2f%% complete", progress * 100.0); + + if (progress > 0) { + struct timeval tv_now; + double elapsed, time_remaining; + + gettimeofday (&tv_now, NULL); + + elapsed = notmuch_time_elapsed (state->tv_start, tv_now); + time_remaining = (elapsed / progress) * (1.0 - progress); + printf (" ("); + notmuch_time_print_formatted_seconds (time_remaining); + printf (" remaining)"); + } + + printf (". \r"); + + fflush (stdout); +} + +/* 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) +{ + notmuch_directory_t *directory; + notmuch_filenames_t *files, *subdirs; + notmuch_status_t status; + char *absolute; + + directory = notmuch_database_get_directory (notmuch, path); + + for (files = notmuch_directory_get_child_files (directory); + notmuch_filenames_valid (files); + notmuch_filenames_move_to_next (files)) + { + 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; + talloc_free (absolute); + } + + for (subdirs = notmuch_directory_get_child_directories (directory); + notmuch_filenames_valid (subdirs); + notmuch_filenames_move_to_next (subdirs)) + { + absolute = talloc_asprintf (ctx, "%s/%s", path, + notmuch_filenames_get (subdirs)); + _remove_directory (ctx, notmuch, absolute, renamed_files, removed_files); + talloc_free (absolute); + } + + notmuch_directory_destroy (directory); +} + int notmuch_new_command (void *ctx, int argc, char *argv[]) { @@ -639,17 +750,13 @@ notmuch_new_command (void *ctx, int argc, char *argv[]) } } - /* Setup our handler for SIGINT */ - memset (&action, 0, sizeof (struct sigaction)); - action.sa_handler = handle_sigint; - sigemptyset (&action.sa_mask); - action.sa_flags = SA_RESTART; - sigaction (SIGINT, &action, NULL); - config = notmuch_config_open (ctx, NULL, NULL); if (config == NULL) 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); dot_notmuch_path = talloc_asprintf (ctx, "%s/%s", db_path, ".notmuch"); @@ -668,12 +775,33 @@ notmuch_new_command (void *ctx, int argc, char *argv[]) } else { notmuch = notmuch_database_open (db_path, NOTMUCH_DATABASE_MODE_READ_WRITE); + if (notmuch == NULL) + return 1; + + if (notmuch_database_needs_upgrade (notmuch)) { + printf ("Welcome to a new version of notmuch! Your database will now be upgraded.\n"); + gettimeofday (&add_files_state.tv_start, NULL); + notmuch_database_upgrade (notmuch, upgrade_print_progress, + &add_files_state); + printf ("Your notmuch database has now been upgraded to database format version %u.\n", + notmuch_database_get_version (notmuch)); + } + add_files_state.total_files = 0; } if (notmuch == NULL) return 1; + /* Setup 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)); + action.sa_handler = handle_sigint; + sigemptyset (&action.sa_mask); + action.sa_flags = SA_RESTART; + sigaction (SIGINT, &action, NULL); + talloc_free (dot_notmuch_path); dot_notmuch_path = NULL; @@ -697,32 +825,31 @@ notmuch_new_command (void *ctx, int argc, char *argv[]) } for (f = add_files_state.removed_directories->head; f; f = f->next) { - notmuch_directory_t *directory; - notmuch_filenames_t *files; + _remove_directory (ctx, notmuch, f->filename, + &renamed_files, &removed_files); + } - directory = notmuch_database_get_directory (notmuch, f->filename); + talloc_free (add_files_state.removed_files); + talloc_free (add_files_state.removed_directories); - for (files = notmuch_directory_get_child_files (directory); - notmuch_filenames_has_more (files); - notmuch_filenames_advance (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. */ + if (add_files_state.synchronize_flags) { + _filename_node_t *node; + notmuch_message_t *message; + for (node = add_files_state.message_ids_to_sync->head; + node; + node = node->next) { - char *absolute; - - absolute = talloc_asprintf (ctx, "%s/%s", f->filename, - notmuch_filenames_get (files)); - status = notmuch_database_remove_message (notmuch, absolute); - if (status == NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID) - renamed_files++; - else - removed_files++; - talloc_free (absolute); + message = notmuch_database_find_message (notmuch, node->filename); + notmuch_message_maildir_flags_to_tags (message); + notmuch_message_destroy (message); } - - notmuch_directory_destroy (directory); } - talloc_free (add_files_state.removed_files); - talloc_free (add_files_state.removed_directories); + talloc_free (add_files_state.message_ids_to_sync); + add_files_state.message_ids_to_sync = NULL; gettimeofday (&tv_now, NULL); elapsed = notmuch_time_elapsed (add_files_state.tv_start,