- /* If we've finished transferring this file, show the time taken;
- * otherwise show expected time to complete. That's kind of
- * inconsistent, but people can probably cope. Hopefully we'll
- * get more consistent and complete progress reporting soon. --
- * mbp */
- double remain = is_last ? (double) diff / 1000.0
- : rate ? (double) (size-ofs) / rate / 1000.0 : 0.0;
- int remain_h, remain_m, remain_s;
+ unsigned long diff;
+ double rate, remain;
+ 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)))
+ diff = 1;
+ rate = (double) (ofs - ph_start.ofs) * 1000.0 / diff / 1024.0;
+ /* 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;
+ rate = (double) (ofs - ph_list[oldest_hpos].ofs) * 1000.0
+ / diff / 1024.0;
+ remain = rate ? (double) (size - ofs) / rate / 1000.0 : 0.0;
+ }