--- src/main.c.orig 2008-02-26 18:04:57.000000000 +0100 +++ src/main.c 2008-02-26 18:06:09.000000000 +0100 @@ -911,7 +911,7 @@ /* Initialize progress. Have to do this after the options are processed so we know where the log file is. */ - if (opt.verbose) + if (!opt.quiet) set_progress_implementation (opt.progress_type); /* Fill in the arguments. */ --- src/retr.c.orig 2008-02-26 18:05:05.000000000 +0100 +++ src/retr.c 2008-02-26 18:06:52.000000000 +0100 @@ -221,7 +221,7 @@ if (flags & rb_skip_startpos) skip = startpos; - if (opt.verbose) + if (!opt.quiet) { /* If we're skipping STARTPOS bytes, pass 0 as the INITIAL argument to progress_create because the indicator doesn't --- src/progress.c.orig 2008-02-26 18:05:12.000000000 +0100 +++ src/progress.c 2008-02-26 18:20:49.000000000 +0100 @@ -289,7 +289,7 @@ been retrieved. 12.8% will round to 12% because the 13% mark has not yet been reached. 100% is only shown when done. */ int percentage = 100.0 * bytes_displayed / dp->total_length; - logprintf (LOG_VERBOSE, "%3d%%", percentage); + logprintf (LOG_NOTQUIET, "%3d%%", percentage); } { @@ -323,7 +323,7 @@ wgint bytes_sofar = bytes_displayed - dp->initial_length; double eta = dltime * bytes_remaining / bytes_sofar; if (eta < INT_MAX - 1) - logprintf (LOG_VERBOSE, " %s", + logprintf (LOG_NOTQUIET, " %s", eta_to_human_short ((int) (eta + 0.5), true)); } } @@ -331,10 +331,10 @@ { /* When done, print the total download time */ if (dltime >= 10) - logprintf (LOG_VERBOSE, "=%s", + logprintf (LOG_NOTQUIET, "=%s", eta_to_human_short ((int) (dltime + 0.5), true)); else - logprintf (LOG_VERBOSE, "=%ss", print_decimal (dltime)); + logprintf (LOG_NOTQUIET, "=%ss", print_decimal (dltime)); } } @@ -649,7 +649,7 @@ create_image (bp, dltime, true); display_image (bp->buffer); - logputs (LOG_VERBOSE, "\n\n"); + logputs (LOG_NOTQUIET, "\n\n"); xfree (bp->buffer); xfree (bp); @@ -784,7 +784,7 @@ char *p = bp->buffer; wgint size = bp->initial_length + bp->count; - const char *size_grouped = with_thousand_seps (size); + const char *size_grouped = with_thousand_seps (size / 1024); int size_grouped_len = strlen (size_grouped); struct bar_progress_hist *hist = &bp->hist; @@ -829,6 +829,7 @@ APPEND_LITERAL (" "); /* The progress bar: "[====> ]" or "[++==> ]". */ + if (opt.verbose) { if (progress_size && bp->total_length > 0) { /* Size of the initial portion. */ @@ -888,9 +889,10 @@ ++bp->tick; } + } - /* " 234,567,890" */ - sprintf (p, " %-11s", size_grouped); + /* " 234,567K" */ + sprintf (p, " %sK", size_grouped); move_to_end (p); /* " 12.52K/s" */ @@ -981,8 +983,8 @@ display_image (char *buf) { bool old = log_set_save_context (false); - logputs (LOG_VERBOSE, "\r"); - logputs (LOG_VERBOSE, buf); + logputs (LOG_NOTQUIET, "\r"); + logputs (LOG_NOTQUIET, buf); log_set_save_context (old); }