X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-new.c;h=2a929c56fe95ebcae44ec8e257033d2a06296fdd;hp=9d206167e997382d623934ce4dd1797751b2e950;hb=84742d86ab2fd3e5b5b601f073351454b993575e;hpb=5f0b2ece161b16321792d9ff2f76bcc33a3b6b42

diff --git a/notmuch-new.c b/notmuch-new.c
index 9d206167..2a929c56 100644
--- a/notmuch-new.c
+++ b/notmuch-new.c
@@ -144,20 +144,9 @@ add_files_recursive (notmuch_database_t *notmuch,
     struct dirent **namelist = NULL;
     int num_entries;
 
-    /* If we're told to, we bail out on encountering a read-only
-     * directory, (with this being a clear clue from the user to
-     * Notmuch that new mail won't be arriving there and we need not
-     * look. */
-    if (state->ignore_read_only_directories &&
-	(st->st_mode & S_IWUSR) == 0)
-    {
-	state->saw_read_only_directory = TRUE;
-	goto DONE;
-    }
-
     path_mtime = st->st_mtime;
 
-    path_dbtime = notmuch_database_get_timestamp (notmuch, path);
+    path_dbtime = notmuch_database_get_directory_mtime (notmuch, path);
     num_entries = scandir (path, &namelist, 0, ino_cmp);
 
     if (num_entries == -1) {
@@ -288,7 +277,7 @@ add_files_recursive (notmuch_database_t *notmuch,
 	next = NULL;
     }
 
-    status = notmuch_database_set_timestamp (notmuch, path, path_mtime);
+    status = notmuch_database_set_directory_mtime (notmuch, path, path_mtime);
     if (status && ret == NOTMUCH_STATUS_SUCCESS)
 	ret = status;
 
@@ -485,14 +474,12 @@ notmuch_new_command (void *ctx, int argc, char *argv[])
 	if (interrupted)
 	    return 1;
 
-	printf ("Found %d total files.     \n", count);
+	printf ("Found %d total files (that's not much mail).\n", count);
 	notmuch = notmuch_database_create (db_path);
-	add_files_state.ignore_read_only_directories = FALSE;
 	add_files_state.total_files = count;
     } else {
 	notmuch = notmuch_database_open (db_path,
 					 NOTMUCH_DATABASE_MODE_READ_WRITE);
-	add_files_state.ignore_read_only_directories = TRUE;
 	add_files_state.total_files = 0;
     }
 
@@ -502,7 +489,6 @@ notmuch_new_command (void *ctx, int argc, char *argv[])
     talloc_free (dot_notmuch_path);
     dot_notmuch_path = NULL;
 
-    add_files_state.saw_read_only_directory = FALSE;
     add_files_state.processed_files = 0;
     add_files_state.added_messages = 0;
     gettimeofday (&add_files_state.tv_start, NULL);
@@ -525,19 +511,12 @@ notmuch_new_command (void *ctx, int argc, char *argv[])
 	}
     }
     if (add_files_state.added_messages) {
-	printf ("Added %d new %s to the database (not much, really).\n",
+	printf ("Added %d new %s to the database.\n",
 		add_files_state.added_messages,
 		add_files_state.added_messages == 1 ?
 		"message" : "messages");
     } else {
-	printf ("No new mail---and that's not much.\n");
-    }
-
-    if (elapsed > 1 && ! add_files_state.saw_read_only_directory) {
-	printf ("\nTip: If you have any sub-directories that are archives (that is,\n"
-		"they will never receive new mail), marking these directories as\n"
-		"read-only (chmod u-w /path/to/dir) will make \"notmuch new\"\n"
-		"much more efficient (it won't even look in those directories).\n");
+	printf ("No new mail.\n");
     }
 
     if (ret) {