From: Carl Worth <cworth@cworth.org>
Date: Thu, 15 Oct 2009 00:10:14 +0000 (-0700)
Subject: Add some sort of progress indicator.
X-Git-Tag: 0.1~856
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=d643f7d7762e358bf7c5611635a36d27e6db9afa;ds=sidebyside

Add some sort of progress indicator.

It's nice to let the user know that something is happening.
---

diff --git a/notmuch-index-message.cc b/notmuch-index-message.cc
index 0b1072d7..60370b62 100644
--- a/notmuch-index-message.cc
+++ b/notmuch-index-message.cc
@@ -54,6 +54,7 @@
 #include <string.h>
 #include <errno.h>
 #include <time.h>
+#include <sys/time.h>
 
 #include <iostream>
 
@@ -677,6 +678,8 @@ main (int argc, char **argv)
     GIOChannel *channel;
     GIOStatus gio_status;
     GError *error = NULL;
+    int count;
+    struct timeval tv_start, tv_now;
 
     if (argc < 2) {
 	usage (argv[0]);
@@ -698,6 +701,10 @@ main (int argc, char **argv)
 
 	channel = g_io_channel_unix_new (fileno (stdin));
 
+	count = 0;
+
+	gettimeofday (&tv_start, NULL);
+
 	while (1) {
 	    gio_status = g_io_channel_read_line (channel, &filename,
 						 NULL, NULL, &error);
@@ -713,6 +720,14 @@ main (int argc, char **argv)
 	    index_file (db, term_gen, filename);
 
 	    g_free (filename);
+
+	    count++;
+	    if (count % 250 == 0) {
+		gettimeofday (&tv_now, NULL);
+		printf ("Indexed %d messages (%g messages/second)\n",
+			count, count / ((tv_now.tv_sec - tv_start.tv_sec) +
+					(tv_now.tv_usec - tv_start.tv_usec) / 1e6));
+	    }
 	}
 
     } catch (const Xapian::Error &error) {