X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-new.c;h=273916e6d1611eb89f49c30119c8d25bf76d6ab5;hp=55c3dc1d8d75c8873fb64308d2e72b5d63cb661e;hb=d9d3d3e6f06a76dc0fbe24c9655b64acfcd4b9e4;hpb=c485c51585d8e51d289eb9830203fa322d7a0740

diff --git a/notmuch-new.c b/notmuch-new.c
index 55c3dc1d..273916e6 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 maildir_sync;
 } 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)
 {
@@ -153,7 +149,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 ||
@@ -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",
@@ -273,8 +270,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
@@ -313,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,
@@ -322,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);
@@ -338,12 +346,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);
@@ -364,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;
 	}
 
@@ -395,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->maildir_sync == 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->maildir_sync == TRUE)
+		notmuch_message_maildir_to_tags (message, next);
 	    break;
 	case NOTMUCH_STATUS_FILE_NOT_EMAIL:
 	    fprintf (stderr, "Note: Ignoring non-mail file: %s\n",
@@ -437,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,
@@ -447,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,
@@ -458,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) {
@@ -618,22 +639,26 @@ count_files (const char *path, int *count)
 
 static void
 upgrade_print_progress (void *closure,
-			unsigned int count,
-			unsigned int total)
+			double progress)
 {
     add_files_state_t *state = closure;
-    struct timeval tv_now;
-    double elapsed_overall, rate_overall, time_remaining;
 
-    gettimeofday (&tv_now, NULL);
+    printf ("Upgrading database: %.2f%% complete", progress * 100.0);
 
-    elapsed_overall = notmuch_time_elapsed (state->tv_start, tv_now);
-    rate_overall = count / elapsed_overall;
-    time_remaining = ((total - count) / rate_overall);
+    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 ("Upgraded %d of %d messages (", count, total);
-    notmuch_time_print_formatted_seconds (time_remaining);
-    printf (" remaining).      \r");
+    printf (".      \r");
 
     fflush (stdout);
 }
@@ -655,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));
@@ -669,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));
@@ -715,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.maildir_sync = notmuch_config_get_maildir_sync (config);
     db_path = notmuch_config_get_database_path (config);
 
     dot_notmuch_path = talloc_asprintf (ctx, "%s/%s", db_path, ".notmuch");