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

diff --git a/src/ChangeLog b/src/ChangeLog
index 1663fb10bff1af6620c1276edc22989c3d67fb47..a8735aa8a1f14eb0acc2285e0d11077d2d3ddb99 100644 (file)
--- 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 a0689f152ab3676ed8bfc1e5a7620df905512f09..10ce59dddb758ceb4382b552f560e0e5d146af25 100644 (file)
--- 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
        {