From: hniksic <devnull@localhost>
Date: Tue, 23 Sep 2003 20:48:10 +0000 (-0700)
Subject: [svn] Force printing of ETA at the end of download.
X-Git-Tag: v1.13~1657
X-Git-Url: http://sjero.net/git/?p=wget;a=commitdiff_plain;h=e6fd9cb79318b2b23cacc42f8cf9b24eadde3574;hp=845a0988b1816f463302e08c7241076f200a7fdf

[svn] Force printing of ETA at the end of download.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 1663fb10..a8735aa8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
 2003-09-23  Hrvoje Niksic  <hniksic@xemacs.org>
 
+	* progress.c (create_image): Print the current ETA if we're done
+	with the download.
+	(create_image): Change '-' display char to '+' in the progress bar.
+
 	* Makefile.in (clean): Remove .libs.
 
 2003-09-23  Hrvoje Niksic  <hniksic@xemacs.org>
diff --git a/src/progress.c b/src/progress.c
index a0689f15..10ce59dd 100644
--- a/src/progress.c
+++ b/src/progress.c
@@ -688,7 +688,7 @@ create_image (struct bar_progress *bp, double dl_total_time)
   else
     APPEND_LITERAL ("    ");
 
-  /* The progress bar: "[====>      ]" or "[--==>      ]". */
+  /* The progress bar: "[====>      ]" or "[++==>      ]". */
   if (progress_size && bp->total_length > 0)
     {
       /* Size of the initial portion. */
@@ -706,10 +706,10 @@ create_image (struct bar_progress *bp, double dl_total_time)
       *p++ = '[';
       begin = p;
 
-      /* Print the initial portion of the download with '-' chars, the
+      /* Print the initial portion of the download with '+' chars, the
 	 rest with '=' and one '>'.  */
       for (i = 0; i < insz; i++)
-	*p++ = '-';
+	*p++ = '+';
       dlsz -= insz;
       if (dlsz > 0)
 	{
@@ -780,8 +780,9 @@ create_image (struct bar_progress *bp, double dl_total_time)
       /* Don't change the value of ETA more than approximately once
 	 per second; doing so would cause flashing without providing
 	 any value to the user. */
-      if (dl_total_time - bp->last_eta_time < 900
-	  && bp->last_eta_value != 0)
+      if (bp->total_length != size
+	  && bp->last_eta_value != 0
+	  && dl_total_time - bp->last_eta_time < 900)
 	eta = bp->last_eta_value;
       else
 	{