X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-new.c;h=23e7afc587b9c79e7dabe28b280955f5890930ef;hp=124d38dc96395613a2316a2e12cbf048a8bd78ff;hb=4cfb2a02778bac16e785bbea1fd6c665e34bd955;hpb=344c48a47de23cc63f1885d850b82359d1a34064 diff --git a/notmuch-new.c b/notmuch-new.c index 124d38dc..23e7afc5 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,7 @@ typedef struct { _filename_list_t *removed_files; _filename_list_t *removed_directories; + notmuch_bool_t synchronize_flags; } add_files_state_t; static volatile sig_atomic_t do_add_files_print_progress = 0; @@ -93,13 +96,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) { @@ -222,6 +218,7 @@ add_files_recursive (notmuch_database_t *notmuch, notmuch_filenames_t *db_subdirs = NULL; struct stat st; notmuch_bool_t is_maildir, new_directory; + const char **tag; if (stat (path, &st)) { fprintf (stderr, "Error reading directory %s: %s\n", @@ -282,7 +279,7 @@ add_files_recursive (notmuch_database_t *notmuch, * recursion). */ if (entry->d_type != DT_DIR && entry->d_type != DT_LNK && - entry->d_type != DT_UKNOWN) + entry->d_type != DT_UNKNOWN) { continue; } @@ -324,7 +321,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, @@ -333,10 +330,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); @@ -349,7 +346,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 we're looking at a symlink, we only want to add it if it @@ -381,10 +378,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; } @@ -412,11 +409,15 @@ add_files_recursive (notmuch_database_t *notmuch, /* success */ case NOTMUCH_STATUS_SUCCESS: state->added_messages++; - tag_inbox_and_unread (message); + for (tag=state->new_tags; *tag != NULL; tag++) + notmuch_message_add_tag (message, *tag); + if (state->synchronize_flags == TRUE) + notmuch_message_maildir_to_tags (message, next); break; /* Non-fatal issues (go on to next file) */ case NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID: - /* Stay silent on this one. */ + if (state->synchronize_flags == TRUE) + notmuch_message_maildir_to_tags (message, next); break; case NOTMUCH_STATUS_FILE_NOT_EMAIL: fprintf (stderr, "Note: Ignoring non-mail file: %s\n", @@ -454,9 +455,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, @@ -464,10 +468,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, @@ -475,7 +479,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) { @@ -676,8 +680,8 @@ _remove_directory (void *ctx, directory = notmuch_database_get_directory (notmuch, path); for (files = notmuch_directory_get_child_files (directory); - notmuch_filenames_has_more (files); - notmuch_filenames_advance (files)) + notmuch_filenames_valid (files); + notmuch_filenames_move_to_next (files)) { absolute = talloc_asprintf (ctx, "%s/%s", path, notmuch_filenames_get (files)); @@ -690,8 +694,8 @@ _remove_directory (void *ctx, } for (subdirs = notmuch_directory_get_child_directories (directory); - notmuch_filenames_has_more (subdirs); - notmuch_filenames_advance (subdirs)) + notmuch_filenames_valid (subdirs); + notmuch_filenames_move_to_next (subdirs)) { absolute = talloc_asprintf (ctx, "%s/%s", path, notmuch_filenames_get (subdirs)); @@ -736,6 +740,8 @@ notmuch_new_command (void *ctx, int argc, char *argv[]) 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); db_path = notmuch_config_get_database_path (config); dot_notmuch_path = talloc_asprintf (ctx, "%s/%s", db_path, ".notmuch");