Bug fixed in the progress bar display.

[finddup.git] / finddup.c

diff --git a/finddup.c b/finddup.c
index 87ae90e..acbbddc 100644 (file)
--- a/finddup.c
+++ b/finddup.c
@@ -47,6 +47,8 @@
 /* 1M really helps compared to 64k */
 #define READ_BUFFER_SIZE (1024 * 1024)
 
+#define PROGRESS_BUFFER_SIZE 1024
+
 typedef int64_t size_sum_t;
 
 /* Yeah, global variables! */
@@ -382,27 +384,46 @@ void print_result(struct file_node *list1, struct file_node *list2) {
   free(nodes);
 }
 
-void print_progress(int max, int n, int *pp) {
-  int p, k;
-  int width, tty_width;
+struct progress_state {
+  int bar_width;
+  int nb_values, value;
+  int last_position;
+};
+
+void print_progress(struct progress_state *state) {
+  int position, k;
   struct winsize win;
+  char buffer[PROGRESS_BUFFER_SIZE];
+  char *s;
 
-  if(show_progress &&
-     isatty(STDOUT_FILENO) &&
-     !ioctl (STDOUT_FILENO, TIOCGWINSZ, (char *) &win)) {
-    tty_width = win.ws_col;
-    width = tty_width - 7;
-    p = (width * n) / (max - 1);
-    if(p > *pp) {
-      for(k = 0; k < p; k++) {
-        fprintf(stderr, "+");
-      }
-      for(; k < width; k++) {
-        fprintf(stderr, "-");
+  if(show_progress) {
+    /* We use the previous bar_width to compute the position, so that
+       we avoid doing too many ioctls */
+    position = (state->bar_width * state->value) / (state->nb_values - 1);
+    if(state->bar_width <= 0 || position != state->last_position) {
+      if(!ioctl (STDERR_FILENO, TIOCGWINSZ, (char *) &win)) {
+        /* Something weird is going on if the previous test is wrong */
+        if(win.ws_col >= PROGRESS_BUFFER_SIZE - 3) {
+          state->bar_width = PROGRESS_BUFFER_SIZE - 10;
+        } else {
+          state->bar_width = win.ws_col - 7;
+        }
+        position = (state->bar_width * state->value) / (state->nb_values - 1);
+        state->last_position = position;
+        s = buffer;
+        for(k = 0; k < position; k++) {
+          *(s++) = '+';
+        }
+        for(; k < state->bar_width; k++) {
+          *(s++) = '-';
+        }
+
+        /* We need four % because of the fprintf that follows */
+        sprintf(s, " [%3d%%%%]\r",
+                (100 * state->value) / (state->nb_values - 1));
+
+        fprintf(stderr, buffer);
       }
-      *pp = p;
-      p = (100 * n) / (max - 1);
-      fprintf(stderr, " [%3d%%]\r", p);
     }
   }
 }
@@ -410,9 +431,10 @@ void print_progress(int max, int n, int *pp) {
 void start(const char *dirname1, const char *dirname2) {
   struct file_node *list1, *list2;
   struct file_node *node1, *node2;
+  struct progress_state progress_state;
   int not_in, found;
   int nb_groups, nb_nodes;
-  int list1_length, previous_progress;
+  int list1_length, list2_length, previous_progress;
 
   char *buffer1 = safe_malloc(sizeof(char) * READ_BUFFER_SIZE);
   char *buffer2 = safe_malloc(sizeof(char) * READ_BUFFER_SIZE);
@@ -425,6 +447,8 @@ void start(const char *dirname1, const char *dirname2) {
 
   list1 = scan_directory(0, dirname1);
 
+  list1_length = file_list_length(list1);
+
   if(dirname2) {
     if(strncmp(dirname2, "not:", 4) == 0) {
       not_in = 1;
@@ -444,16 +468,30 @@ void start(const char *dirname1, const char *dirname2) {
 
   if(show_progress) {
     fprintf(stderr, "done.\n");
+    fprintf(stderr,
+            "%s: %d file%s.\n",
+            dirname1, list1_length, (list1_length > 1 ? "s" : ""));
+    if(dirname2) {
+      list2_length = file_list_length(list2);
+      fprintf(stderr,
+              "%s: %d file%s.\n",
+              dirname2, list2_length, (list2_length > 1 ? "s" : ""));
+    }
+    fprintf(stderr, "Now looking for identical files.\n");
   }
 
   nb_groups = 0;
   previous_progress = -1;
   nb_nodes = 0;
-  list1_length = file_list_length(list1);
+
+  progress_state.bar_width = -1;
+  progress_state.last_position = -1;
+  progress_state.nb_values = list1_length;
 
   if(not_in) {
     for(node1 = list1; node1; node1 = node1->next) {
-      print_progress(list1_length, nb_nodes, &previous_progress);
+      progress_state.value = nb_nodes;
+      print_progress(&progress_state);
       nb_nodes++;
 
       found = 0;
@@ -475,7 +513,8 @@ void start(const char *dirname1, const char *dirname2) {
 
   } else {
     for(node1 = list1; node1; node1 = node1->next) {
-      print_progress(list1_length, nb_nodes, &previous_progress);
+      progress_state.value = nb_nodes;
+      print_progress(&progress_state);
       nb_nodes++;
 
       for(node2 = list2; node2; node2 = node2->next) {
@@ -615,6 +654,10 @@ int main(int argc, char **argv) {
     }
   }
 
+  if(!isatty(STDERR_FILENO)) {
+    show_progress = 0;
+  }
+
   if(optind + 2 == argc) {
     start(argv[optind], argv[optind + 1]);
   } else if(optind + 1 == argc) {