From: Francois Fleuret <francois@fleuret.org>
Date: Thu, 11 Mar 2010 17:21:44 +0000 (+0100)
Subject: Changed the progress display to a progress bar + percentage.
X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=commitdiff_plain;h=35064530c38bcca4897f684b07d8de6ca25b0e47;p=finddup.git

Changed the progress display to a progress bar + percentage.
---

diff --git a/finddup.c b/finddup.c
index f1e3cf0..9b65d40 100644
--- a/finddup.c
+++ b/finddup.c
@@ -41,8 +41,8 @@
 #include <getopt.h>
 #include <fcntl.h>
 
-#define BUFFER_SIZE 4096
-#define LARGE_BUFFER_SIZE 65536
+/* 1M really helps compared to 64k */
+#define READ_BUFFER_SIZE (1024 * 1024)
 
 typedef int64_t size_sum_t;
 
@@ -68,6 +68,9 @@ int show_groups = 1; /* 1 means to show the group IDs when printing
 int ignore_same_inode = 0; /* 1 means that comparison between two file
                               with same inode will always be false */
 
+int tty_width = -1; /* Positive value means what width to use to show
+                       the progress bar */
+
 /********************************************************************/
 
 /* malloc with error checking.  */
@@ -138,15 +141,15 @@ int file_list_length(struct file_with_size *head) {
 
 int same_content(struct file_with_size *f1, struct file_with_size *f2) {
   int fd1, fd2, s1, s2;
-  char buffer1[LARGE_BUFFER_SIZE], buffer2[LARGE_BUFFER_SIZE];
+  char buffer1[READ_BUFFER_SIZE], buffer2[READ_BUFFER_SIZE];
 
   fd1 = open(f1->filename, O_RDONLY);
   fd2 = open(f2->filename, O_RDONLY);
 
   if(fd1 >= 0 && fd2 >= 0) {
     while(1) {
-      s1 = read(fd1, buffer1, LARGE_BUFFER_SIZE);
-      s2 = read(fd2, buffer2, LARGE_BUFFER_SIZE);
+      s1 = read(fd1, buffer1, READ_BUFFER_SIZE);
+      s2 = read(fd2, buffer2, READ_BUFFER_SIZE);
 
       if(s1 < 0 || s2 < 0) {
         close(fd1);
@@ -333,11 +336,31 @@ void print_result(struct file_with_size *list1, struct file_with_size *list2) {
   free(nodes);
 }
 
+void print_progress(int max, int n, int *pp) {
+  int p, k;
+  int width;
+  if(show_progress && tty_width > 0) {
+    width = tty_width - 7;
+    p = (width * n) / max;
+    if(p > *pp) {
+      for(k = 0; k < p; k++) {
+        fprintf(stderr, "+");
+      }
+      for(; k < width; k++) {
+        fprintf(stderr, "-");
+      }
+      *pp = p;
+      p = (100 * n) / max;
+      fprintf(stderr, " [% 3d%%]\r", p);
+    }
+  }
+}
+
 void start(const char *dirname1, const char *dirname2) {
   struct file_with_size *list1, *list2;
   struct file_with_size *node1, *node2;
   int not_in, found;
-  int k, p, pp, l1, n;
+  int k, pp, l1, n;
 
   not_in = 0;
 
@@ -374,14 +397,8 @@ void start(const char *dirname1, const char *dirname2) {
 
   if(not_in) {
     for(node1 = list1; node1; node1 = node1->next) {
-      if(show_progress) {
-        p = (100 * n)/l1;
-        if(p > pp) {
-          fprintf(stderr, "%d%%\n", p);
-          pp = p;
-        }
-        n++;
-      }
+      print_progress(l1, n, &pp);
+      n++;
 
       found = 0;
 
@@ -402,14 +419,8 @@ void start(const char *dirname1, const char *dirname2) {
 
   } else {
     for(node1 = list1; node1; node1 = node1->next) {
-      if(show_progress) {
-        p = (100 * n)/l1;
-        if(p > pp) {
-          fprintf(stderr, "%d%%\n", p);
-          pp = p;
-        }
-        n++;
-      }
+      print_progress(l1, n, &pp);
+      n++;
 
       for(node2 = list2; node2; node2 = node2->next) {
         if(node1->group_id < 0 || node2->group_id < 0) {
@@ -433,6 +444,10 @@ void start(const char *dirname1, const char *dirname2) {
     }
   }
 
+  if(show_progress) {
+    fprintf(stderr, "\n");
+  }
+
   if(dirname2) {
     print_result(list1, list2);
     file_list_delete(list1);
@@ -465,6 +480,7 @@ void print_help(FILE *out) {
 int main(int argc, char **argv) {
   int c;
   struct file_with_size *root;
+  struct winsize win;
 
   root = 0;
 
@@ -516,6 +532,12 @@ int main(int argc, char **argv) {
     }
   }
 
+  if(show_progress &&
+     isatty(STDOUT_FILENO) &&
+     !ioctl (STDOUT_FILENO, TIOCGWINSZ, (char *) &win)) {
+    tty_width = win.ws_col;
+  }
+
   if(optind + 2 == argc) {
     start(argv[optind], argv[optind + 1]);
   } else if(optind + 1 == argc) {