X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-new.c;h=c4b7da38afe07ede1b998cd082298f9f2f75577a;hp=44b50aaa2c49ceea06825abea39256790f2c1a5d;hb=7c450905e41d9bc81aca82f4593a5b42a4bb8e31;hpb=4e5d2f22db290a830c0267f34b519c6138af00ed

diff --git a/notmuch-new.c b/notmuch-new.c
index 44b50aaa..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)
 {
@@ -222,6 +220,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",
@@ -309,9 +308,16 @@ 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. */
@@ -412,11 +418,20 @@ 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",
@@ -454,6 +469,9 @@ 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_valid (db_files))
@@ -736,6 +754,9 @@ 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);
+    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");
@@ -811,6 +832,25 @@ notmuch_new_command (void *ctx, int argc, char *argv[])
     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. */
+    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)
+	{
+	    message = notmuch_database_find_message (notmuch, node->filename);
+	    notmuch_message_maildir_flags_to_tags (message);
+	    notmuch_message_destroy (message);
+	}
+    }
+
+    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,
 				    tv_now);