Changed human_num() to big_num() with an extra arg so that it can

[rsync/rsync.git] / progress.c

diff --git a/progress.c b/progress.c
index 73ad838..b09ca11 100644 (file)
--- a/progress.c
+++ b/progress.c
@@ -4,7 +4,7 @@
  * Copyright (C) 1996-2000 Andrew Tridgell
  * Copyright (C) 1996 Paul Mackerras
  * Copyright (C) 2001, 2002 Martin Pool <mbp@samba.org>
- * Copyright (C) 2003-2007 Wayne Davison
+ * Copyright (C) 2003-2008 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,8 +22,12 @@
 
 #include "rsync.h"
 
-extern struct stats stats;
 extern int am_server;
+extern int need_unsorted_flist;
+extern int output_needs_newline;
+extern int human_readable;
+extern struct stats stats;
+extern struct file_list *cur_flist;
 
 #define PROGRESS_HISTORY_SECS 5
 
@@ -41,6 +45,7 @@ struct progress_history {
 static struct progress_history ph_start;
 static struct progress_history ph_list[PROGRESS_HISTORY_SECS];
 static int newest_hpos, oldest_hpos;
+static int current_file_index;
 
 static unsigned long msdiff(struct timeval *t1, struct timeval *t2)
 {
@@ -59,14 +64,28 @@ static unsigned long msdiff(struct timeval *t1, struct timeval *t2)
 static void rprint_progress(OFF_T ofs, OFF_T size, struct timeval *now,
                            int is_last)
 {
-       char eol[256];
+       char rembuf[64], eol[128];
        const char *units;
-       int pct = ofs == size ? 100 : (int) (100.0 * ofs / size);
        unsigned long diff;
        double rate, remain;
-       int remain_h, remain_m, remain_s;
+       int pct;
 
        if (is_last) {
+               int len = snprintf(eol, sizeof eol,
+                       " (xfer#%d, to-check=%d/%d)\n",
+                       stats.num_transferred_files,
+                       stats.num_files - current_file_index - 1,
+                       stats.num_files);
+               if (INFO_GTE(PROGRESS, 2)) {
+                       static int last_len = 0;
+                       /* Drop \n and pad with spaces if line got shorter. */
+                       if (last_len < --len)
+                               last_len = len;
+                       eol[last_len] = '\0';
+                       while (last_len > len)
+                               eol[--last_len] = ' ';
+                       is_last = 0;
+               }
                /* Compute stats based on the starting info. */
                if (!ph_start.time.tv_sec
                    || !(diff = msdiff(&ph_start.time, now)))
@@ -75,6 +94,7 @@ static void rprint_progress(OFF_T ofs, OFF_T size, struct timeval *now,
                /* Switch to total time taken for our last update. */
                remain = (double) diff / 1000.0;
        } else {
+               strlcpy(eol, "  ", sizeof eol);
                /* Compute stats based on recent progress. */
                if (!(diff = msdiff(&ph_list[oldest_hpos].time, now)))
                        diff = 1;
@@ -93,20 +113,34 @@ static void rprint_progress(OFF_T ofs, OFF_T size, struct timeval *now,
                units = "kB/s";
        }
 
-       remain_s = (int) remain % 60;
-       remain_m = (int) (remain / 60.0) % 60;
-       remain_h = (int) (remain / 3600.0);
+       if (remain < 0)
+               strlcpy(rembuf, "  ??:??:??", sizeof rembuf);
+       else {
+               snprintf(rembuf, sizeof rembuf, "%4d:%02d:%02d",
+                        (int) (remain / 3600.0),
+                        (int) (remain / 60.0) % 60,
+                        (int) remain % 60);
+       }
 
-       if (is_last) {
-               snprintf(eol, sizeof eol, " (xfer#%d, to-check=%d/%d)\n",
-                       stats.num_transferred_files,
-                       stats.num_files - stats.current_file_index - 1,
-                       stats.num_files);
-       } else
-               strlcpy(eol, "\r", sizeof eol);
-       rprintf(FCLIENT, "%12s %3d%% %7.2f%s %4d:%02d:%02d%s",
-               human_num(ofs), pct, rate, units,
-               remain_h, remain_m, remain_s, eol);
+       output_needs_newline = 0;
+       pct = ofs == size ? 100 : (int) (100.0 * ofs / size);
+       rprintf(FCLIENT, "\r%12s %3d%% %7.2f%s %s%s",
+               big_num(ofs, human_readable), pct, rate, units, rembuf, eol);
+       if (!is_last) {
+               output_needs_newline = 1;
+               rflush(FCLIENT);
+       }
+}
+
+void set_current_file_index(struct file_struct *file, int ndx)
+{
+       if (!file)
+               current_file_index = cur_flist->used + cur_flist->ndx_start - 1;
+       else if (need_unsorted_flist)
+               current_file_index = flist_find(cur_flist, file) + cur_flist->ndx_start;
+       else
+               current_file_index = ndx;
+       current_file_index -= cur_flist->flist_num;
 }
 
 void end_progress(OFF_T size)
@@ -114,9 +148,14 @@ void end_progress(OFF_T size)
        if (!am_server) {
                struct timeval now;
                gettimeofday(&now, NULL);
-               rprint_progress(size, size, &now, True);
+               if (INFO_GTE(PROGRESS, 2)) {
+                       rprint_progress(stats.total_transferred_size,
+                                       stats.total_size, &now, True);
+               } else {
+                       rprint_progress(size, size, &now, True);
+                       memset(&ph_start, 0, sizeof ph_start);
+               }
        }
-       memset(&ph_start, 0, sizeof ph_start);
 }
 
 void show_progress(OFF_T ofs, OFF_T size)
@@ -172,5 +211,9 @@ void show_progress(OFF_T ofs, OFF_T size)
                return;
 #endif
 
-       rprint_progress(ofs, size, &now, False);
+       if (INFO_GTE(PROGRESS, 2)) {
+               rprint_progress(stats.total_transferred_size,
+                               stats.total_size, &now, False);
+       } else
+               rprint_progress(ofs, size, &now, False);
 }