X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=notmuch-new.c;h=b740ee2b8c29d0e09d65f19de92693f2bcb448b3;hb=9a66a8f8770ccccb5394f4c8e633d1cf884043f6;hp=0d06253d9fb5221949ce6da83ac3d97d58ee4f0e;hpb=e307e990c9394b6426e55b28c748c265358a1c89;p=notmuch

diff --git a/notmuch-new.c b/notmuch-new.c
index 0d06253d..b740ee2b 100644
--- a/notmuch-new.c
+++ b/notmuch-new.c
@@ -618,22 +618,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);
 }
@@ -711,13 +715,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;
@@ -758,6 +755,15 @@ notmuch_new_command (void *ctx, int argc, char *argv[])
     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;