X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=notmuch-new.c;h=3e6b96a7c45688501b512650d9332ac1c02032b2;hb=c5416b6f1b2ec0ab1bcc011b521542a7839479d2;hp=739ca1189a8834bb46c540a99039b1f30f1195c3;hpb=21f8fd6967c3ef8e726652bbd6944e29975508b5;p=notmuch

diff --git a/notmuch-new.c b/notmuch-new.c
index 739ca118..3e6b96a7 100644
--- a/notmuch-new.c
+++ b/notmuch-new.c
@@ -153,7 +153,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 ||
@@ -273,7 +273,8 @@ add_files_recursive (notmuch_database_t *notmuch,
 
 	entry = fs_entries[i];
 
-	if (entry->d_type != DT_DIR && entry->d_type != DT_LNK)
+	if (entry->d_type != DT_DIR && entry->d_type != DT_LNK
+			&& entry->d_type != DT_UNKNOWN)
 	    continue;
 
 	/* Ignore special directories to avoid infinite recursion.
@@ -343,7 +344,7 @@ add_files_recursive (notmuch_database_t *notmuch,
 
 	/* 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) {
+	if (entry->d_type == DT_LNK || entry->d_type == DT_UNKNOWN) {
 	    int err;
 
 	    next = talloc_asprintf (notmuch, "%s/%s", path, entry->d_name);
@@ -616,6 +617,32 @@ 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
@@ -689,13 +716,6 @@ 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;
@@ -718,12 +738,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;