2001-11-22 23:59:52 -05:00
|
|
|
|
/* Download progress.
|
2008-01-25 08:04:01 -05:00
|
|
|
|
Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007,
|
|
|
|
|
2008 Free Software Foundation, Inc.
|
2001-11-22 23:59:52 -05:00
|
|
|
|
|
|
|
|
|
This file is part of GNU Wget.
|
|
|
|
|
|
|
|
|
|
GNU Wget is free software; you can redistribute it and/or modify
|
|
|
|
|
it under the terms of the GNU General Public License as published by
|
2007-07-10 01:53:22 -04:00
|
|
|
|
the Free Software Foundation; either version 3 of the License, or
|
2001-11-27 21:24:22 -05:00
|
|
|
|
(at your option) any later version.
|
2001-11-22 23:59:52 -05:00
|
|
|
|
|
|
|
|
|
GNU Wget is distributed in the hope that it will be useful,
|
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
GNU General Public License for more details.
|
|
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
2007-07-10 01:53:22 -04:00
|
|
|
|
along with Wget. If not, see <http://www.gnu.org/licenses/>.
|
2002-05-17 22:16:36 -04:00
|
|
|
|
|
2007-11-28 03:05:33 -05:00
|
|
|
|
Additional permission under GNU GPL version 3 section 7
|
|
|
|
|
|
|
|
|
|
If you modify this program, or any covered work, by linking or
|
|
|
|
|
combining it with the OpenSSL project's OpenSSL library (or a
|
|
|
|
|
modified version of that library), containing parts covered by the
|
|
|
|
|
terms of the OpenSSL or SSLeay licenses, the Free Software Foundation
|
|
|
|
|
grants you additional permission to convey the resulting work.
|
|
|
|
|
Corresponding Source for a non-source form of such a combination
|
|
|
|
|
shall include the source code for the parts of OpenSSL used as well
|
|
|
|
|
as that of the covered work. */
|
2001-11-22 23:59:52 -05:00
|
|
|
|
|
2007-10-18 23:50:40 -04:00
|
|
|
|
#include "wget.h"
|
2001-11-22 23:59:52 -05:00
|
|
|
|
|
|
|
|
|
#include <stdio.h>
|
|
|
|
|
#include <stdlib.h>
|
2005-06-19 18:34:58 -04:00
|
|
|
|
#include <string.h>
|
2001-11-22 23:59:52 -05:00
|
|
|
|
#include <assert.h>
|
2001-11-24 22:10:34 -05:00
|
|
|
|
#ifdef HAVE_UNISTD_H
|
|
|
|
|
# include <unistd.h>
|
|
|
|
|
#endif
|
2005-06-19 19:03:27 -04:00
|
|
|
|
#include <signal.h>
|
2008-02-03 04:48:50 -05:00
|
|
|
|
#ifdef HAVE_WCHAR_H
|
|
|
|
|
# include <wchar.h>
|
|
|
|
|
#endif
|
2001-11-22 23:59:52 -05:00
|
|
|
|
|
|
|
|
|
#include "progress.h"
|
|
|
|
|
#include "utils.h"
|
|
|
|
|
#include "retr.h"
|
|
|
|
|
|
|
|
|
|
struct progress_implementation {
|
2003-12-14 08:35:27 -05:00
|
|
|
|
const char *name;
|
2005-06-22 15:38:10 -04:00
|
|
|
|
bool interactive;
|
2005-06-19 18:34:58 -04:00
|
|
|
|
void *(*create) (wgint, wgint);
|
|
|
|
|
void (*update) (void *, wgint, double);
|
|
|
|
|
void (*finish) (void *, double);
|
|
|
|
|
void (*set_params) (const char *);
|
2001-11-22 23:59:52 -05:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* Necessary forward declarations. */
|
|
|
|
|
|
2005-06-19 18:34:58 -04:00
|
|
|
|
static void *dot_create (wgint, wgint);
|
|
|
|
|
static void dot_update (void *, wgint, double);
|
|
|
|
|
static void dot_finish (void *, double);
|
|
|
|
|
static void dot_set_params (const char *);
|
2001-11-22 23:59:52 -05:00
|
|
|
|
|
2005-06-19 18:34:58 -04:00
|
|
|
|
static void *bar_create (wgint, wgint);
|
|
|
|
|
static void bar_update (void *, wgint, double);
|
|
|
|
|
static void bar_finish (void *, double);
|
|
|
|
|
static void bar_set_params (const char *);
|
2001-11-22 23:59:52 -05:00
|
|
|
|
|
|
|
|
|
static struct progress_implementation implementations[] = {
|
2003-11-08 11:56:52 -05:00
|
|
|
|
{ "dot", 0, dot_create, dot_update, dot_finish, dot_set_params },
|
|
|
|
|
{ "bar", 1, bar_create, bar_update, bar_finish, bar_set_params }
|
2001-11-22 23:59:52 -05:00
|
|
|
|
};
|
|
|
|
|
static struct progress_implementation *current_impl;
|
2001-12-08 20:24:41 -05:00
|
|
|
|
static int current_impl_locked;
|
2001-11-22 23:59:52 -05:00
|
|
|
|
|
2001-11-27 05:29:45 -05:00
|
|
|
|
/* Progress implementation used by default. Can be overriden in
|
|
|
|
|
wgetrc or by the fallback one. */
|
|
|
|
|
|
|
|
|
|
#define DEFAULT_PROGRESS_IMPLEMENTATION "bar"
|
|
|
|
|
|
2005-06-26 19:04:56 -04:00
|
|
|
|
/* Fallback progress implementation should be something that works
|
2001-11-23 11:12:53 -05:00
|
|
|
|
under all display types. If you put something other than "dot"
|
|
|
|
|
here, remember that bar_set_params tries to switch to this if we're
|
|
|
|
|
not running on a TTY. So changing this to "bar" could cause
|
|
|
|
|
infloop. */
|
|
|
|
|
|
2001-11-27 05:29:45 -05:00
|
|
|
|
#define FALLBACK_PROGRESS_IMPLEMENTATION "dot"
|
2001-11-23 11:12:53 -05:00
|
|
|
|
|
2005-06-22 15:38:10 -04:00
|
|
|
|
/* Return true if NAME names a valid progress bar implementation. The
|
|
|
|
|
characters after the first : will be ignored. */
|
2001-11-22 23:59:52 -05:00
|
|
|
|
|
2005-06-22 15:38:10 -04:00
|
|
|
|
bool
|
2001-11-22 23:59:52 -05:00
|
|
|
|
valid_progress_implementation_p (const char *name)
|
|
|
|
|
{
|
2008-05-31 01:42:36 -04:00
|
|
|
|
size_t i;
|
2001-11-22 23:59:52 -05:00
|
|
|
|
struct progress_implementation *pi = implementations;
|
|
|
|
|
char *colon = strchr (name, ':');
|
2008-05-31 01:42:36 -04:00
|
|
|
|
size_t namelen = colon ? (size_t) (colon - name) : strlen (name);
|
2001-11-22 23:59:52 -05:00
|
|
|
|
|
2003-09-19 10:08:37 -04:00
|
|
|
|
for (i = 0; i < countof (implementations); i++, pi++)
|
2001-11-22 23:59:52 -05:00
|
|
|
|
if (!strncmp (pi->name, name, namelen))
|
2005-06-22 15:38:10 -04:00
|
|
|
|
return true;
|
|
|
|
|
return false;
|
2001-11-22 23:59:52 -05:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Set the progress implementation to NAME. */
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
set_progress_implementation (const char *name)
|
|
|
|
|
{
|
2008-05-31 01:42:36 -04:00
|
|
|
|
size_t i, namelen;
|
2001-11-22 23:59:52 -05:00
|
|
|
|
struct progress_implementation *pi = implementations;
|
2005-06-26 19:04:56 -04:00
|
|
|
|
const char *colon;
|
2001-11-23 11:12:53 -05:00
|
|
|
|
|
|
|
|
|
if (!name)
|
|
|
|
|
name = DEFAULT_PROGRESS_IMPLEMENTATION;
|
|
|
|
|
|
|
|
|
|
colon = strchr (name, ':');
|
2008-05-31 01:42:36 -04:00
|
|
|
|
namelen = colon ? (size_t) (colon - name) : strlen (name);
|
2001-11-22 23:59:52 -05:00
|
|
|
|
|
2003-09-19 10:08:37 -04:00
|
|
|
|
for (i = 0; i < countof (implementations); i++, pi++)
|
2001-11-22 23:59:52 -05:00
|
|
|
|
if (!strncmp (pi->name, name, namelen))
|
|
|
|
|
{
|
2007-08-02 23:38:21 -04:00
|
|
|
|
current_impl = pi;
|
|
|
|
|
current_impl_locked = 0;
|
|
|
|
|
|
|
|
|
|
if (colon)
|
|
|
|
|
/* We call pi->set_params even if colon is NULL because we
|
|
|
|
|
want to give the implementation a chance to set up some
|
|
|
|
|
things it needs to run. */
|
|
|
|
|
++colon;
|
|
|
|
|
|
|
|
|
|
if (pi->set_params)
|
|
|
|
|
pi->set_params (colon);
|
|
|
|
|
return;
|
2001-11-22 23:59:52 -05:00
|
|
|
|
}
|
|
|
|
|
abort ();
|
|
|
|
|
}
|
|
|
|
|
|
2001-12-06 02:14:35 -05:00
|
|
|
|
static int output_redirected;
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
progress_schedule_redirect (void)
|
|
|
|
|
{
|
|
|
|
|
output_redirected = 1;
|
|
|
|
|
}
|
|
|
|
|
|
2001-11-22 23:59:52 -05:00
|
|
|
|
/* Create a progress gauge. INITIAL is the number of bytes the
|
|
|
|
|
download starts from (zero if the download starts from scratch).
|
|
|
|
|
TOTAL is the expected total number of bytes in this download. If
|
|
|
|
|
TOTAL is zero, it means that the download size is not known in
|
|
|
|
|
advance. */
|
|
|
|
|
|
|
|
|
|
void *
|
2005-02-23 17:21:04 -05:00
|
|
|
|
progress_create (wgint initial, wgint total)
|
2001-11-22 23:59:52 -05:00
|
|
|
|
{
|
2001-12-06 02:14:35 -05:00
|
|
|
|
/* Check if the log status has changed under our feet. */
|
|
|
|
|
if (output_redirected)
|
|
|
|
|
{
|
|
|
|
|
if (!current_impl_locked)
|
2007-08-02 23:38:21 -04:00
|
|
|
|
set_progress_implementation (FALLBACK_PROGRESS_IMPLEMENTATION);
|
2001-12-06 02:14:35 -05:00
|
|
|
|
output_redirected = 0;
|
|
|
|
|
}
|
|
|
|
|
|
2001-11-22 23:59:52 -05:00
|
|
|
|
return current_impl->create (initial, total);
|
|
|
|
|
}
|
|
|
|
|
|
2005-06-22 15:38:10 -04:00
|
|
|
|
/* Return true if the progress gauge is "interactive", i.e. if it can
|
|
|
|
|
profit from being called regularly even in absence of data. The
|
|
|
|
|
progress bar is interactive because it regularly updates the ETA
|
|
|
|
|
and current update. */
|
2003-11-08 11:56:52 -05:00
|
|
|
|
|
2005-06-22 15:38:10 -04:00
|
|
|
|
bool
|
2003-11-08 11:56:52 -05:00
|
|
|
|
progress_interactive_p (void *progress)
|
|
|
|
|
{
|
|
|
|
|
return current_impl->interactive;
|
|
|
|
|
}
|
|
|
|
|
|
2001-11-26 07:49:10 -05:00
|
|
|
|
/* Inform the progress gauge of newly received bytes. DLTIME is the
|
2005-07-06 12:35:42 -04:00
|
|
|
|
time since the beginning of the download. */
|
2001-11-22 23:59:52 -05:00
|
|
|
|
|
|
|
|
|
void
|
2005-02-23 17:21:04 -05:00
|
|
|
|
progress_update (void *progress, wgint howmuch, double dltime)
|
2001-11-22 23:59:52 -05:00
|
|
|
|
{
|
2001-11-26 07:49:10 -05:00
|
|
|
|
current_impl->update (progress, howmuch, dltime);
|
2001-11-22 23:59:52 -05:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Tell the progress gauge to clean up. Calling this will free the
|
|
|
|
|
PROGRESS object, the further use of which is not allowed. */
|
|
|
|
|
|
|
|
|
|
void
|
2003-09-15 17:14:15 -04:00
|
|
|
|
progress_finish (void *progress, double dltime)
|
2001-11-22 23:59:52 -05:00
|
|
|
|
{
|
2001-11-26 07:49:10 -05:00
|
|
|
|
current_impl->finish (progress, dltime);
|
2001-11-22 23:59:52 -05:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Dot-printing. */
|
|
|
|
|
|
|
|
|
|
struct dot_progress {
|
2007-08-02 23:38:21 -04:00
|
|
|
|
wgint initial_length; /* how many bytes have been downloaded
|
|
|
|
|
previously. */
|
|
|
|
|
wgint total_length; /* expected total byte count when the
|
|
|
|
|
download finishes */
|
2001-11-22 23:59:52 -05:00
|
|
|
|
|
2007-08-02 23:38:21 -04:00
|
|
|
|
int accumulated; /* number of bytes accumulated after
|
|
|
|
|
the last printed dot */
|
2001-11-22 23:59:52 -05:00
|
|
|
|
|
2007-08-02 23:38:21 -04:00
|
|
|
|
int rows; /* number of rows printed so far */
|
|
|
|
|
int dots; /* number of dots printed in this row */
|
2005-06-28 18:03:12 -04:00
|
|
|
|
|
2003-09-15 17:14:15 -04:00
|
|
|
|
double last_timer_value;
|
2001-11-22 23:59:52 -05:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* Dot-progress backend for progress_create. */
|
|
|
|
|
|
|
|
|
|
static void *
|
2005-02-23 17:21:04 -05:00
|
|
|
|
dot_create (wgint initial, wgint total)
|
2001-11-22 23:59:52 -05:00
|
|
|
|
{
|
2003-10-31 09:55:50 -05:00
|
|
|
|
struct dot_progress *dp = xnew0 (struct dot_progress);
|
2001-11-22 23:59:52 -05:00
|
|
|
|
dp->initial_length = initial;
|
|
|
|
|
dp->total_length = total;
|
|
|
|
|
|
|
|
|
|
if (dp->initial_length)
|
|
|
|
|
{
|
|
|
|
|
int dot_bytes = opt.dot_bytes;
|
2005-06-28 18:03:12 -04:00
|
|
|
|
const wgint ROW_BYTES = opt.dot_bytes * opt.dots_in_line;
|
2001-11-22 23:59:52 -05:00
|
|
|
|
|
2005-06-28 18:03:12 -04:00
|
|
|
|
int remainder = dp->initial_length % ROW_BYTES;
|
2005-02-23 17:21:04 -05:00
|
|
|
|
wgint skipped = dp->initial_length - remainder;
|
2001-11-22 23:59:52 -05:00
|
|
|
|
|
|
|
|
|
if (skipped)
|
2007-08-02 23:38:21 -04:00
|
|
|
|
{
|
|
|
|
|
wgint skipped_k = skipped / 1024; /* skipped amount in K */
|
|
|
|
|
int skipped_k_len = numdigit (skipped_k);
|
|
|
|
|
if (skipped_k_len < 6)
|
|
|
|
|
skipped_k_len = 6;
|
|
|
|
|
|
|
|
|
|
/* Align the [ skipping ... ] line with the dots. To do
|
|
|
|
|
that, insert the number of spaces equal to the number of
|
|
|
|
|
digits in the skipped amount in K. */
|
|
|
|
|
logprintf (LOG_VERBOSE, _("\n%*s[ skipping %sK ]"),
|
|
|
|
|
2 + skipped_k_len, "",
|
|
|
|
|
number_to_static_string (skipped_k));
|
|
|
|
|
}
|
2001-11-22 23:59:52 -05:00
|
|
|
|
|
2005-06-28 18:03:12 -04:00
|
|
|
|
logprintf (LOG_VERBOSE, "\n%6sK",
|
2007-08-02 23:38:21 -04:00
|
|
|
|
number_to_static_string (skipped / 1024));
|
2001-11-22 23:59:52 -05:00
|
|
|
|
for (; remainder >= dot_bytes; remainder -= dot_bytes)
|
2007-08-02 23:38:21 -04:00
|
|
|
|
{
|
|
|
|
|
if (dp->dots % opt.dot_spacing == 0)
|
|
|
|
|
logputs (LOG_VERBOSE, " ");
|
|
|
|
|
logputs (LOG_VERBOSE, ",");
|
|
|
|
|
++dp->dots;
|
|
|
|
|
}
|
2001-11-22 23:59:52 -05:00
|
|
|
|
assert (dp->dots < opt.dots_in_line);
|
|
|
|
|
|
|
|
|
|
dp->accumulated = remainder;
|
2005-06-28 18:03:12 -04:00
|
|
|
|
dp->rows = skipped / ROW_BYTES;
|
2001-11-22 23:59:52 -05:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return dp;
|
|
|
|
|
}
|
|
|
|
|
|
2005-06-28 18:03:12 -04:00
|
|
|
|
static const char *eta_to_human_short (int, bool);
|
|
|
|
|
|
|
|
|
|
/* Prints the stats (percentage of completion, speed, ETA) for current
|
|
|
|
|
row. DLTIME is the time spent downloading the data in current
|
|
|
|
|
row.
|
|
|
|
|
|
|
|
|
|
#### This function is somewhat uglified by the fact that current
|
|
|
|
|
row and last row have somewhat different stats requirements. It
|
|
|
|
|
might be worthwhile to split it to two different functions. */
|
2001-11-22 23:59:52 -05:00
|
|
|
|
|
|
|
|
|
static void
|
2005-06-28 18:03:12 -04:00
|
|
|
|
print_row_stats (struct dot_progress *dp, double dltime, bool last)
|
2001-11-22 23:59:52 -05:00
|
|
|
|
{
|
2005-06-28 18:03:12 -04:00
|
|
|
|
const wgint ROW_BYTES = opt.dot_bytes * opt.dots_in_line;
|
|
|
|
|
|
|
|
|
|
/* bytes_displayed is the number of bytes indicated to the user by
|
|
|
|
|
dots printed so far, includes the initially "skipped" amount */
|
|
|
|
|
wgint bytes_displayed = dp->rows * ROW_BYTES + dp->dots * opt.dot_bytes;
|
|
|
|
|
|
|
|
|
|
if (last)
|
|
|
|
|
/* For last row also count bytes accumulated after last dot */
|
|
|
|
|
bytes_displayed += dp->accumulated;
|
|
|
|
|
|
|
|
|
|
if (dp->total_length)
|
|
|
|
|
{
|
|
|
|
|
/* Round to floor value to provide gauge how much data *has*
|
2007-08-02 23:38:21 -04:00
|
|
|
|
been retrieved. 12.8% will round to 12% because the 13% mark
|
|
|
|
|
has not yet been reached. 100% is only shown when done. */
|
2005-06-28 18:03:12 -04:00
|
|
|
|
int percentage = 100.0 * bytes_displayed / dp->total_length;
|
|
|
|
|
logprintf (LOG_VERBOSE, "%3d%%", percentage);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
{
|
|
|
|
|
static char names[] = {' ', 'K', 'M', 'G'};
|
|
|
|
|
int units;
|
|
|
|
|
double rate;
|
|
|
|
|
wgint bytes_this_row;
|
|
|
|
|
if (!last)
|
|
|
|
|
bytes_this_row = ROW_BYTES;
|
|
|
|
|
else
|
|
|
|
|
/* For last row also include bytes accumulated after last dot. */
|
|
|
|
|
bytes_this_row = dp->dots * opt.dot_bytes + dp->accumulated;
|
2005-06-28 20:45:02 -04:00
|
|
|
|
/* Don't count the portion of the row belonging to initial_length */
|
2005-06-28 18:03:12 -04:00
|
|
|
|
if (dp->rows == dp->initial_length / ROW_BYTES)
|
|
|
|
|
bytes_this_row -= dp->initial_length % ROW_BYTES;
|
|
|
|
|
rate = calc_rate (bytes_this_row, dltime - dp->last_timer_value, &units);
|
|
|
|
|
logprintf (LOG_VERBOSE, " %4.*f%c",
|
2007-08-02 23:38:21 -04:00
|
|
|
|
rate >= 99.95 ? 0 : rate >= 9.995 ? 1 : 2,
|
|
|
|
|
rate, names[units]);
|
2005-06-28 18:03:12 -04:00
|
|
|
|
dp->last_timer_value = dltime;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!last)
|
|
|
|
|
{
|
2005-06-28 18:32:45 -04:00
|
|
|
|
/* Display ETA based on average speed. Inspired by Vladi
|
2007-08-02 23:38:21 -04:00
|
|
|
|
Belperchinov-Shabanski's "wget-new-percentage" patch. */
|
2005-06-28 18:03:12 -04:00
|
|
|
|
if (dp->total_length)
|
2007-08-02 23:38:21 -04:00
|
|
|
|
{
|
|
|
|
|
wgint bytes_remaining = dp->total_length - bytes_displayed;
|
|
|
|
|
/* The quantity downloaded in this download run. */
|
|
|
|
|
wgint bytes_sofar = bytes_displayed - dp->initial_length;
|
|
|
|
|
double eta = dltime * bytes_remaining / bytes_sofar;
|
|
|
|
|
if (eta < INT_MAX - 1)
|
|
|
|
|
logprintf (LOG_VERBOSE, " %s",
|
|
|
|
|
eta_to_human_short ((int) (eta + 0.5), true));
|
|
|
|
|
}
|
2005-06-28 18:03:12 -04:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* When done, print the total download time */
|
2005-07-06 12:35:42 -04:00
|
|
|
|
if (dltime >= 10)
|
2007-08-02 23:38:21 -04:00
|
|
|
|
logprintf (LOG_VERBOSE, "=%s",
|
|
|
|
|
eta_to_human_short ((int) (dltime + 0.5), true));
|
2005-06-28 18:03:12 -04:00
|
|
|
|
else
|
2007-08-02 23:38:21 -04:00
|
|
|
|
logprintf (LOG_VERBOSE, "=%ss", print_decimal (dltime));
|
2005-06-28 18:03:12 -04:00
|
|
|
|
}
|
2001-11-22 23:59:52 -05:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Dot-progress backend for progress_update. */
|
|
|
|
|
|
|
|
|
|
static void
|
2005-02-23 17:21:04 -05:00
|
|
|
|
dot_update (void *progress, wgint howmuch, double dltime)
|
2001-11-22 23:59:52 -05:00
|
|
|
|
{
|
|
|
|
|
struct dot_progress *dp = progress;
|
|
|
|
|
int dot_bytes = opt.dot_bytes;
|
2005-06-28 18:03:12 -04:00
|
|
|
|
wgint ROW_BYTES = opt.dot_bytes * opt.dots_in_line;
|
2001-11-22 23:59:52 -05:00
|
|
|
|
|
2005-06-22 15:38:10 -04:00
|
|
|
|
log_set_flush (false);
|
2001-11-22 23:59:52 -05:00
|
|
|
|
|
|
|
|
|
dp->accumulated += howmuch;
|
|
|
|
|
for (; dp->accumulated >= dot_bytes; dp->accumulated -= dot_bytes)
|
|
|
|
|
{
|
|
|
|
|
if (dp->dots == 0)
|
2007-08-02 23:38:21 -04:00
|
|
|
|
logprintf (LOG_VERBOSE, "\n%6sK",
|
|
|
|
|
number_to_static_string (dp->rows * ROW_BYTES / 1024));
|
2001-11-22 23:59:52 -05:00
|
|
|
|
|
|
|
|
|
if (dp->dots % opt.dot_spacing == 0)
|
2007-08-02 23:38:21 -04:00
|
|
|
|
logputs (LOG_VERBOSE, " ");
|
2001-11-22 23:59:52 -05:00
|
|
|
|
logputs (LOG_VERBOSE, ".");
|
|
|
|
|
|
|
|
|
|
++dp->dots;
|
|
|
|
|
if (dp->dots >= opt.dots_in_line)
|
2007-08-02 23:38:21 -04:00
|
|
|
|
{
|
|
|
|
|
++dp->rows;
|
|
|
|
|
dp->dots = 0;
|
2001-11-22 23:59:52 -05:00
|
|
|
|
|
2007-08-02 23:38:21 -04:00
|
|
|
|
print_row_stats (dp, dltime, false);
|
|
|
|
|
}
|
2001-11-22 23:59:52 -05:00
|
|
|
|
}
|
|
|
|
|
|
2005-06-22 15:38:10 -04:00
|
|
|
|
log_set_flush (true);
|
2001-11-22 23:59:52 -05:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Dot-progress backend for progress_finish. */
|
|
|
|
|
|
|
|
|
|
static void
|
2003-09-15 17:14:15 -04:00
|
|
|
|
dot_finish (void *progress, double dltime)
|
2001-11-22 23:59:52 -05:00
|
|
|
|
{
|
|
|
|
|
struct dot_progress *dp = progress;
|
2005-06-28 18:03:12 -04:00
|
|
|
|
wgint ROW_BYTES = opt.dot_bytes * opt.dots_in_line;
|
2001-11-22 23:59:52 -05:00
|
|
|
|
int i;
|
|
|
|
|
|
2005-06-22 15:38:10 -04:00
|
|
|
|
log_set_flush (false);
|
2001-11-22 23:59:52 -05:00
|
|
|
|
|
2001-11-27 21:44:18 -05:00
|
|
|
|
if (dp->dots == 0)
|
2005-06-28 18:03:12 -04:00
|
|
|
|
logprintf (LOG_VERBOSE, "\n%6sK",
|
2007-08-02 23:38:21 -04:00
|
|
|
|
number_to_static_string (dp->rows * ROW_BYTES / 1024));
|
2001-11-22 23:59:52 -05:00
|
|
|
|
for (i = dp->dots; i < opt.dots_in_line; i++)
|
|
|
|
|
{
|
|
|
|
|
if (i % opt.dot_spacing == 0)
|
2007-08-02 23:38:21 -04:00
|
|
|
|
logputs (LOG_VERBOSE, " ");
|
2001-11-22 23:59:52 -05:00
|
|
|
|
logputs (LOG_VERBOSE, " ");
|
|
|
|
|
}
|
|
|
|
|
|
2005-06-28 18:03:12 -04:00
|
|
|
|
print_row_stats (dp, dltime, true);
|
2001-11-26 15:07:13 -05:00
|
|
|
|
logputs (LOG_VERBOSE, "\n\n");
|
2005-06-22 15:38:10 -04:00
|
|
|
|
log_set_flush (false);
|
2001-11-22 23:59:52 -05:00
|
|
|
|
|
|
|
|
|
xfree (dp);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* This function interprets the progress "parameters". For example,
|
2001-11-27 21:24:22 -05:00
|
|
|
|
if Wget is invoked with --progress=dot:mega, it will set the
|
2001-11-22 23:59:52 -05:00
|
|
|
|
"dot-style" to "mega". Valid styles are default, binary, mega, and
|
|
|
|
|
giga. */
|
|
|
|
|
|
|
|
|
|
static void
|
2001-11-23 11:12:53 -05:00
|
|
|
|
dot_set_params (const char *params)
|
2001-11-22 23:59:52 -05:00
|
|
|
|
{
|
2001-11-27 21:44:18 -05:00
|
|
|
|
if (!params || !*params)
|
|
|
|
|
params = opt.dot_style;
|
|
|
|
|
|
2001-11-22 23:59:52 -05:00
|
|
|
|
if (!params)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
/* We use this to set the retrieval style. */
|
|
|
|
|
if (!strcasecmp (params, "default"))
|
|
|
|
|
{
|
|
|
|
|
/* Default style: 1K dots, 10 dots in a cluster, 50 dots in a
|
2007-08-02 23:38:21 -04:00
|
|
|
|
line. */
|
2001-11-22 23:59:52 -05:00
|
|
|
|
opt.dot_bytes = 1024;
|
|
|
|
|
opt.dot_spacing = 10;
|
|
|
|
|
opt.dots_in_line = 50;
|
|
|
|
|
}
|
|
|
|
|
else if (!strcasecmp (params, "binary"))
|
|
|
|
|
{
|
|
|
|
|
/* "Binary" retrieval: 8K dots, 16 dots in a cluster, 48 dots
|
2007-08-02 23:38:21 -04:00
|
|
|
|
(384K) in a line. */
|
2001-11-22 23:59:52 -05:00
|
|
|
|
opt.dot_bytes = 8192;
|
|
|
|
|
opt.dot_spacing = 16;
|
|
|
|
|
opt.dots_in_line = 48;
|
|
|
|
|
}
|
|
|
|
|
else if (!strcasecmp (params, "mega"))
|
|
|
|
|
{
|
|
|
|
|
/* "Mega" retrieval, for retrieving very long files; each dot is
|
2007-08-02 23:38:21 -04:00
|
|
|
|
64K, 8 dots in a cluster, 6 clusters (3M) in a line. */
|
2001-11-22 23:59:52 -05:00
|
|
|
|
opt.dot_bytes = 65536L;
|
|
|
|
|
opt.dot_spacing = 8;
|
|
|
|
|
opt.dots_in_line = 48;
|
|
|
|
|
}
|
|
|
|
|
else if (!strcasecmp (params, "giga"))
|
|
|
|
|
{
|
|
|
|
|
/* "Giga" retrieval, for retrieving very very *very* long files;
|
2007-08-02 23:38:21 -04:00
|
|
|
|
each dot is 1M, 8 dots in a cluster, 4 clusters (32M) in a
|
|
|
|
|
line. */
|
2001-11-22 23:59:52 -05:00
|
|
|
|
opt.dot_bytes = (1L << 20);
|
|
|
|
|
opt.dot_spacing = 8;
|
|
|
|
|
opt.dots_in_line = 32;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
fprintf (stderr,
|
2008-04-16 06:25:45 -04:00
|
|
|
|
_("Invalid dot style specification %s; leaving unchanged.\n"),
|
|
|
|
|
quote (params));
|
2001-11-22 23:59:52 -05:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* "Thermometer" (bar) progress. */
|
|
|
|
|
|
|
|
|
|
/* Assumed screen width if we can't find the real value. */
|
|
|
|
|
#define DEFAULT_SCREEN_WIDTH 80
|
|
|
|
|
|
|
|
|
|
/* Minimum screen width we'll try to work with. If this is too small,
|
|
|
|
|
create_image will overflow the buffer. */
|
|
|
|
|
#define MINIMUM_SCREEN_WIDTH 45
|
|
|
|
|
|
2003-11-04 08:37:14 -05:00
|
|
|
|
/* The last known screen width. This can be updated by the code that
|
|
|
|
|
detects that SIGWINCH was received (but it's never updated from the
|
|
|
|
|
signal handler). */
|
|
|
|
|
static int screen_width;
|
|
|
|
|
|
|
|
|
|
/* A flag that, when set, means SIGWINCH was received. */
|
|
|
|
|
static volatile sig_atomic_t received_sigwinch;
|
2001-11-22 23:59:52 -05:00
|
|
|
|
|
2003-09-15 17:14:15 -04:00
|
|
|
|
/* Size of the download speed history ring. */
|
2003-09-22 13:14:19 -04:00
|
|
|
|
#define DLSPEED_HISTORY_SIZE 20
|
2002-04-10 05:24:28 -04:00
|
|
|
|
|
2003-09-15 17:14:15 -04:00
|
|
|
|
/* The minimum time length of a history sample. By default, each
|
2003-09-22 13:14:19 -04:00
|
|
|
|
sample is at least 150ms long, which means that, over the course of
|
|
|
|
|
20 samples, "current" download speed spans at least 3s into the
|
2003-09-15 17:14:15 -04:00
|
|
|
|
past. */
|
2005-07-06 12:35:42 -04:00
|
|
|
|
#define DLSPEED_SAMPLE_MIN 0.15
|
2002-04-10 05:24:28 -04:00
|
|
|
|
|
2003-11-08 11:56:52 -05:00
|
|
|
|
/* The time after which the download starts to be considered
|
|
|
|
|
"stalled", i.e. the current bandwidth is not printed and the recent
|
|
|
|
|
download speeds are scratched. */
|
2005-07-06 12:35:42 -04:00
|
|
|
|
#define STALL_START_TIME 5
|
2003-11-08 11:56:52 -05:00
|
|
|
|
|
2005-09-01 12:44:11 -04:00
|
|
|
|
/* Time between screen refreshes will not be shorter than this, so
|
|
|
|
|
that Wget doesn't swamp the TTY with output. */
|
|
|
|
|
#define REFRESH_INTERVAL 0.2
|
|
|
|
|
|
|
|
|
|
/* Don't refresh the ETA too often to avoid jerkiness in predictions.
|
|
|
|
|
This allows ETA to change approximately once per second. */
|
|
|
|
|
#define ETA_REFRESH_INTERVAL 0.99
|
|
|
|
|
|
2001-11-22 23:59:52 -05:00
|
|
|
|
struct bar_progress {
|
2007-08-02 23:38:21 -04:00
|
|
|
|
wgint initial_length; /* how many bytes have been downloaded
|
|
|
|
|
previously. */
|
|
|
|
|
wgint total_length; /* expected total byte count when the
|
|
|
|
|
download finishes */
|
|
|
|
|
wgint count; /* bytes downloaded so far */
|
|
|
|
|
|
|
|
|
|
double last_screen_update; /* time of the last screen update,
|
|
|
|
|
measured since the beginning of
|
|
|
|
|
download. */
|
|
|
|
|
|
|
|
|
|
int width; /* screen width we're using at the
|
|
|
|
|
time the progress gauge was
|
|
|
|
|
created. this is different from
|
|
|
|
|
the screen_width global variable in
|
|
|
|
|
that the latter can be changed by a
|
|
|
|
|
signal. */
|
|
|
|
|
char *buffer; /* buffer where the bar "image" is
|
|
|
|
|
stored. */
|
|
|
|
|
int tick; /* counter used for drawing the
|
|
|
|
|
progress bar where the total size
|
|
|
|
|
is not known. */
|
2002-04-09 18:10:01 -04:00
|
|
|
|
|
|
|
|
|
/* The following variables (kept in a struct for namespace reasons)
|
2002-04-10 05:24:28 -04:00
|
|
|
|
keep track of recent download speeds. See bar_update() for
|
|
|
|
|
details. */
|
|
|
|
|
struct bar_progress_hist {
|
|
|
|
|
int pos;
|
2005-07-06 12:35:42 -04:00
|
|
|
|
double times[DLSPEED_HISTORY_SIZE];
|
2005-02-23 17:21:04 -05:00
|
|
|
|
wgint bytes[DLSPEED_HISTORY_SIZE];
|
2003-09-15 17:14:15 -04:00
|
|
|
|
|
|
|
|
|
/* The sum of times and bytes respectively, maintained for
|
|
|
|
|
efficiency. */
|
2005-07-06 12:35:42 -04:00
|
|
|
|
double total_time;
|
2005-02-23 17:21:04 -05:00
|
|
|
|
wgint total_bytes;
|
2002-04-10 05:24:28 -04:00
|
|
|
|
} hist;
|
2002-04-09 18:10:01 -04:00
|
|
|
|
|
2007-08-02 23:38:21 -04:00
|
|
|
|
double recent_start; /* timestamp of beginning of current
|
|
|
|
|
position. */
|
|
|
|
|
wgint recent_bytes; /* bytes downloaded so far. */
|
2003-09-15 17:14:15 -04:00
|
|
|
|
|
2007-08-02 23:38:21 -04:00
|
|
|
|
bool stalled; /* set when no data arrives for longer
|
|
|
|
|
than STALL_START_TIME, then reset
|
|
|
|
|
when new data arrives. */
|
2003-11-08 11:56:52 -05:00
|
|
|
|
|
2002-04-09 18:10:01 -04:00
|
|
|
|
/* create_image() uses these to make sure that ETA information
|
2003-11-08 11:56:52 -05:00
|
|
|
|
doesn't flicker. */
|
2007-08-02 23:38:21 -04:00
|
|
|
|
double last_eta_time; /* time of the last update to download
|
|
|
|
|
speed and ETA, measured since the
|
|
|
|
|
beginning of download. */
|
2005-06-25 17:08:04 -04:00
|
|
|
|
int last_eta_value;
|
2001-11-22 23:59:52 -05:00
|
|
|
|
};
|
|
|
|
|
|
2005-06-25 20:41:09 -04:00
|
|
|
|
static void create_image (struct bar_progress *, double, bool);
|
2005-06-19 18:34:58 -04:00
|
|
|
|
static void display_image (char *);
|
2001-11-22 23:59:52 -05:00
|
|
|
|
|
|
|
|
|
static void *
|
2005-02-23 17:21:04 -05:00
|
|
|
|
bar_create (wgint initial, wgint total)
|
2001-11-22 23:59:52 -05:00
|
|
|
|
{
|
2003-10-31 09:55:50 -05:00
|
|
|
|
struct bar_progress *bp = xnew0 (struct bar_progress);
|
2001-11-22 23:59:52 -05:00
|
|
|
|
|
2002-04-11 14:51:26 -04:00
|
|
|
|
/* In theory, our callers should take care of this pathological
|
|
|
|
|
case, but it can sometimes happen. */
|
|
|
|
|
if (initial > total)
|
|
|
|
|
total = initial;
|
|
|
|
|
|
2001-11-22 23:59:52 -05:00
|
|
|
|
bp->initial_length = initial;
|
|
|
|
|
bp->total_length = total;
|
2001-12-06 05:45:27 -05:00
|
|
|
|
|
2003-11-04 08:37:14 -05:00
|
|
|
|
/* Initialize screen_width if this hasn't been done or if it might
|
|
|
|
|
have changed, as indicated by receiving SIGWINCH. */
|
|
|
|
|
if (!screen_width || received_sigwinch)
|
|
|
|
|
{
|
|
|
|
|
screen_width = determine_screen_width ();
|
|
|
|
|
if (!screen_width)
|
2007-08-02 23:38:21 -04:00
|
|
|
|
screen_width = DEFAULT_SCREEN_WIDTH;
|
2003-11-04 08:37:14 -05:00
|
|
|
|
else if (screen_width < MINIMUM_SCREEN_WIDTH)
|
2007-08-02 23:38:21 -04:00
|
|
|
|
screen_width = MINIMUM_SCREEN_WIDTH;
|
2003-11-04 08:37:14 -05:00
|
|
|
|
received_sigwinch = 0;
|
|
|
|
|
}
|
|
|
|
|
|
2001-12-06 05:45:27 -05:00
|
|
|
|
/* - 1 because we don't want to use the last screen column. */
|
|
|
|
|
bp->width = screen_width - 1;
|
2008-02-03 03:53:16 -05:00
|
|
|
|
/* + enough space for the terminating zero, and hopefully enough room
|
|
|
|
|
* for multibyte characters. */
|
|
|
|
|
bp->buffer = xmalloc (bp->width + 100);
|
2001-11-22 23:59:52 -05:00
|
|
|
|
|
2001-11-27 21:44:18 -05:00
|
|
|
|
logputs (LOG_VERBOSE, "\n");
|
2001-11-22 23:59:52 -05:00
|
|
|
|
|
2005-06-25 20:41:09 -04:00
|
|
|
|
create_image (bp, 0, false);
|
2001-11-22 23:59:52 -05:00
|
|
|
|
display_image (bp->buffer);
|
|
|
|
|
|
|
|
|
|
return bp;
|
|
|
|
|
}
|
|
|
|
|
|
2005-06-19 18:34:58 -04:00
|
|
|
|
static void update_speed_ring (struct bar_progress *, wgint, double);
|
2003-09-15 17:14:15 -04:00
|
|
|
|
|
2001-11-22 23:59:52 -05:00
|
|
|
|
static void
|
2005-02-23 17:21:04 -05:00
|
|
|
|
bar_update (void *progress, wgint howmuch, double dltime)
|
2001-11-22 23:59:52 -05:00
|
|
|
|
{
|
|
|
|
|
struct bar_progress *bp = progress;
|
2005-06-22 15:38:10 -04:00
|
|
|
|
bool force_screen_update = false;
|
2001-11-22 23:59:52 -05:00
|
|
|
|
|
|
|
|
|
bp->count += howmuch;
|
2001-11-24 13:05:57 -05:00
|
|
|
|
if (bp->total_length > 0
|
|
|
|
|
&& bp->count + bp->initial_length > bp->total_length)
|
2001-11-23 00:09:39 -05:00
|
|
|
|
/* We could be downloading more than total_length, e.g. when the
|
|
|
|
|
server sends an incorrect Content-Length header. In that case,
|
|
|
|
|
adjust bp->total_length to the new reality, so that the code in
|
|
|
|
|
create_image() that depends on total size being smaller or
|
|
|
|
|
equal to the expected size doesn't abort. */
|
2002-04-11 14:51:26 -04:00
|
|
|
|
bp->total_length = bp->initial_length + bp->count;
|
2001-11-22 23:59:52 -05:00
|
|
|
|
|
2003-09-15 17:14:15 -04:00
|
|
|
|
update_speed_ring (bp, howmuch, dltime);
|
2002-04-09 18:10:01 -04:00
|
|
|
|
|
2003-11-04 08:37:14 -05:00
|
|
|
|
/* If SIGWINCH (the window size change signal) been received,
|
|
|
|
|
determine the new screen size and update the screen. */
|
|
|
|
|
if (received_sigwinch)
|
2001-11-22 23:59:52 -05:00
|
|
|
|
{
|
2003-11-04 08:37:14 -05:00
|
|
|
|
int old_width = screen_width;
|
|
|
|
|
screen_width = determine_screen_width ();
|
|
|
|
|
if (!screen_width)
|
2007-08-02 23:38:21 -04:00
|
|
|
|
screen_width = DEFAULT_SCREEN_WIDTH;
|
2003-11-04 08:37:14 -05:00
|
|
|
|
else if (screen_width < MINIMUM_SCREEN_WIDTH)
|
2007-08-02 23:38:21 -04:00
|
|
|
|
screen_width = MINIMUM_SCREEN_WIDTH;
|
2003-11-04 08:37:14 -05:00
|
|
|
|
if (screen_width != old_width)
|
2007-08-02 23:38:21 -04:00
|
|
|
|
{
|
|
|
|
|
bp->width = screen_width - 1;
|
2008-02-03 03:53:16 -05:00
|
|
|
|
bp->buffer = xrealloc (bp->buffer, bp->width + 100);
|
2007-08-02 23:38:21 -04:00
|
|
|
|
force_screen_update = true;
|
|
|
|
|
}
|
2003-11-04 08:37:14 -05:00
|
|
|
|
received_sigwinch = 0;
|
2001-11-22 23:59:52 -05:00
|
|
|
|
}
|
|
|
|
|
|
2005-09-01 12:44:11 -04:00
|
|
|
|
if (dltime - bp->last_screen_update < REFRESH_INTERVAL && !force_screen_update)
|
2001-12-06 05:45:27 -05:00
|
|
|
|
/* Don't update more often than five times per second. */
|
2001-11-22 23:59:52 -05:00
|
|
|
|
return;
|
|
|
|
|
|
2005-06-25 20:41:09 -04:00
|
|
|
|
create_image (bp, dltime, false);
|
2001-11-22 23:59:52 -05:00
|
|
|
|
display_image (bp->buffer);
|
2002-04-09 18:10:01 -04:00
|
|
|
|
bp->last_screen_update = dltime;
|
2001-11-22 23:59:52 -05:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
2003-09-15 17:14:15 -04:00
|
|
|
|
bar_finish (void *progress, double dltime)
|
2001-11-22 23:59:52 -05:00
|
|
|
|
{
|
|
|
|
|
struct bar_progress *bp = progress;
|
|
|
|
|
|
2002-04-11 14:51:26 -04:00
|
|
|
|
if (bp->total_length > 0
|
|
|
|
|
&& bp->count + bp->initial_length > bp->total_length)
|
|
|
|
|
/* See bar_update() for explanation. */
|
|
|
|
|
bp->total_length = bp->initial_length + bp->count;
|
|
|
|
|
|
2005-06-25 20:41:09 -04:00
|
|
|
|
create_image (bp, dltime, true);
|
2001-11-22 23:59:52 -05:00
|
|
|
|
display_image (bp->buffer);
|
|
|
|
|
|
|
|
|
|
logputs (LOG_VERBOSE, "\n\n");
|
|
|
|
|
|
|
|
|
|
xfree (bp->buffer);
|
|
|
|
|
xfree (bp);
|
|
|
|
|
}
|
|
|
|
|
|
2003-09-15 17:14:15 -04:00
|
|
|
|
/* This code attempts to maintain the notion of a "current" download
|
|
|
|
|
speed, over the course of no less than 3s. (Shorter intervals
|
|
|
|
|
produce very erratic results.)
|
|
|
|
|
|
2003-09-22 13:14:19 -04:00
|
|
|
|
To do so, it samples the speed in 150ms intervals and stores the
|
2003-09-15 17:14:15 -04:00
|
|
|
|
recorded samples in a FIFO history ring. The ring stores no more
|
2003-09-22 13:14:19 -04:00
|
|
|
|
than 20 intervals, hence the history covers the period of at least
|
|
|
|
|
three seconds and at most 20 reads into the past. This method
|
|
|
|
|
should produce reasonable results for downloads ranging from very
|
|
|
|
|
slow to very fast.
|
2003-09-15 17:14:15 -04:00
|
|
|
|
|
|
|
|
|
The idea is that for fast downloads, we get the speed over exactly
|
|
|
|
|
the last three seconds. For slow downloads (where a network read
|
2003-09-22 13:14:19 -04:00
|
|
|
|
takes more than 150ms to complete), we get the speed over a larger
|
2003-09-15 17:14:15 -04:00
|
|
|
|
time period, as large as it takes to complete thirty reads. This
|
|
|
|
|
is good because slow downloads tend to fluctuate more and a
|
2003-09-22 13:14:19 -04:00
|
|
|
|
3-second average would be too erratic. */
|
2003-09-15 17:14:15 -04:00
|
|
|
|
|
|
|
|
|
static void
|
2005-02-23 17:21:04 -05:00
|
|
|
|
update_speed_ring (struct bar_progress *bp, wgint howmuch, double dltime)
|
2003-09-15 17:14:15 -04:00
|
|
|
|
{
|
|
|
|
|
struct bar_progress_hist *hist = &bp->hist;
|
|
|
|
|
double recent_age = dltime - bp->recent_start;
|
|
|
|
|
|
|
|
|
|
/* Update the download count. */
|
|
|
|
|
bp->recent_bytes += howmuch;
|
|
|
|
|
|
|
|
|
|
/* For very small time intervals, we return after having updated the
|
|
|
|
|
"recent" download count. When its age reaches or exceeds minimum
|
|
|
|
|
sample time, it will be recorded in the history ring. */
|
|
|
|
|
if (recent_age < DLSPEED_SAMPLE_MIN)
|
|
|
|
|
return;
|
|
|
|
|
|
2003-11-08 11:56:52 -05:00
|
|
|
|
if (howmuch == 0)
|
|
|
|
|
{
|
|
|
|
|
/* If we're not downloading anything, we might be stalling,
|
2007-08-02 23:38:21 -04:00
|
|
|
|
i.e. not downloading anything for an extended period of time.
|
|
|
|
|
Since 0-reads do not enter the history ring, recent_age
|
|
|
|
|
effectively measures the time since last read. */
|
2003-11-08 11:56:52 -05:00
|
|
|
|
if (recent_age >= STALL_START_TIME)
|
2007-08-02 23:38:21 -04:00
|
|
|
|
{
|
|
|
|
|
/* If we're stalling, reset the ring contents because it's
|
|
|
|
|
stale and because it will make bar_update stop printing
|
|
|
|
|
the (bogus) current bandwidth. */
|
|
|
|
|
bp->stalled = true;
|
|
|
|
|
xzero (*hist);
|
|
|
|
|
bp->recent_bytes = 0;
|
|
|
|
|
}
|
2003-11-08 11:56:52 -05:00
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* We now have a non-zero amount of to store to the speed ring. */
|
|
|
|
|
|
|
|
|
|
/* If the stall status was acquired, reset it. */
|
|
|
|
|
if (bp->stalled)
|
|
|
|
|
{
|
2005-06-22 15:38:10 -04:00
|
|
|
|
bp->stalled = false;
|
2003-11-08 11:56:52 -05:00
|
|
|
|
/* "recent_age" includes the the entired stalled period, which
|
2007-08-02 23:38:21 -04:00
|
|
|
|
could be very long. Don't update the speed ring with that
|
|
|
|
|
value because the current bandwidth would start too small.
|
|
|
|
|
Start with an arbitrary (but more reasonable) time value and
|
|
|
|
|
let it level out. */
|
2005-07-06 12:35:42 -04:00
|
|
|
|
recent_age = 1;
|
2003-11-08 11:56:52 -05:00
|
|
|
|
}
|
|
|
|
|
|
2003-09-15 17:14:15 -04:00
|
|
|
|
/* Store "recent" bytes and download time to history ring at the
|
|
|
|
|
position POS. */
|
|
|
|
|
|
|
|
|
|
/* To correctly maintain the totals, first invalidate existing data
|
|
|
|
|
(least recent in time) at this position. */
|
|
|
|
|
hist->total_time -= hist->times[hist->pos];
|
|
|
|
|
hist->total_bytes -= hist->bytes[hist->pos];
|
|
|
|
|
|
|
|
|
|
/* Now store the new data and update the totals. */
|
|
|
|
|
hist->times[hist->pos] = recent_age;
|
|
|
|
|
hist->bytes[hist->pos] = bp->recent_bytes;
|
|
|
|
|
hist->total_time += recent_age;
|
|
|
|
|
hist->total_bytes += bp->recent_bytes;
|
|
|
|
|
|
|
|
|
|
/* Start a new "recent" period. */
|
|
|
|
|
bp->recent_start = dltime;
|
|
|
|
|
bp->recent_bytes = 0;
|
|
|
|
|
|
|
|
|
|
/* Advance the current ring position. */
|
|
|
|
|
if (++hist->pos == DLSPEED_HISTORY_SIZE)
|
|
|
|
|
hist->pos = 0;
|
|
|
|
|
|
2003-11-08 12:00:45 -05:00
|
|
|
|
#if 0
|
2003-09-15 17:14:15 -04:00
|
|
|
|
/* Sledgehammer check to verify that the totals are accurate. */
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
double sumt = 0, sumb = 0;
|
|
|
|
|
for (i = 0; i < DLSPEED_HISTORY_SIZE; i++)
|
|
|
|
|
{
|
2007-08-02 23:38:21 -04:00
|
|
|
|
sumt += hist->times[i];
|
|
|
|
|
sumb += hist->bytes[i];
|
2003-09-15 17:14:15 -04:00
|
|
|
|
}
|
|
|
|
|
assert (sumb == hist->total_bytes);
|
2005-07-06 12:35:42 -04:00
|
|
|
|
/* We can't use assert(sumt==hist->total_time) because some
|
|
|
|
|
precision is lost by adding and subtracting floating-point
|
|
|
|
|
numbers. But during a download this precision should not be
|
|
|
|
|
detectable, i.e. no larger than 1ns. */
|
|
|
|
|
double diff = sumt - hist->total_time;
|
|
|
|
|
if (diff < 0) diff = -diff;
|
|
|
|
|
assert (diff < 1e-9);
|
2003-09-15 17:14:15 -04:00
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
|
2008-02-06 19:53:46 -05:00
|
|
|
|
#if USE_NLS_PROGRESS_BAR
|
2008-02-03 03:53:16 -05:00
|
|
|
|
int
|
|
|
|
|
count_cols (const char *mbs)
|
|
|
|
|
{
|
|
|
|
|
wchar_t wc;
|
|
|
|
|
int bytes;
|
|
|
|
|
int remaining = strlen(mbs);
|
|
|
|
|
int cols = 0;
|
2008-02-03 04:28:05 -05:00
|
|
|
|
int wccols;
|
2008-02-03 03:53:16 -05:00
|
|
|
|
|
|
|
|
|
while (*mbs != '\0')
|
|
|
|
|
{
|
|
|
|
|
bytes = mbtowc (&wc, mbs, remaining);
|
2008-02-03 04:28:05 -05:00
|
|
|
|
assert (bytes != 0); /* Only happens when *mbs == '\0' */
|
|
|
|
|
if (bytes == -1)
|
|
|
|
|
{
|
|
|
|
|
/* Invalid sequence. We'll just have to fudge it. */
|
|
|
|
|
return cols + remaining;
|
|
|
|
|
}
|
2008-02-03 03:53:16 -05:00
|
|
|
|
mbs += bytes;
|
|
|
|
|
remaining -= bytes;
|
2008-02-03 04:28:05 -05:00
|
|
|
|
wccols = wcwidth(wc);
|
|
|
|
|
cols += (wccols == -1? 1 : wccols);
|
2008-02-03 03:53:16 -05:00
|
|
|
|
}
|
|
|
|
|
return cols;
|
|
|
|
|
}
|
2008-02-06 21:10:24 -05:00
|
|
|
|
#else
|
|
|
|
|
# define count_cols(mbs) ((int)(strlen(mbs)))
|
|
|
|
|
#endif
|
2008-02-03 03:53:16 -05:00
|
|
|
|
|
|
|
|
|
const char *
|
2008-04-30 16:48:30 -04:00
|
|
|
|
get_eta (int *bcd)
|
2008-02-03 03:53:16 -05:00
|
|
|
|
{
|
2008-04-30 16:48:30 -04:00
|
|
|
|
/* Translation note: "ETA" is English-centric, but this must
|
|
|
|
|
be short, ideally 3 chars. Abbreviate if necessary. */
|
|
|
|
|
static const char eta_str[] = N_(" eta %s");
|
|
|
|
|
static const char *eta_trans;
|
|
|
|
|
static int bytes_cols_diff;
|
2008-02-03 03:53:16 -05:00
|
|
|
|
if (eta_trans == NULL)
|
|
|
|
|
{
|
|
|
|
|
int nbytes;
|
|
|
|
|
int ncols;
|
|
|
|
|
|
2008-02-06 19:53:46 -05:00
|
|
|
|
#if USE_NLS_PROGRESS_BAR
|
2008-02-03 03:53:16 -05:00
|
|
|
|
eta_trans = _(eta_str);
|
2008-02-06 21:10:24 -05:00
|
|
|
|
#else
|
|
|
|
|
eta_trans = eta_str;
|
|
|
|
|
#endif
|
2008-02-03 03:53:16 -05:00
|
|
|
|
|
|
|
|
|
/* Determine the number of bytes used in the translated string,
|
|
|
|
|
* versus the number of columns used. This is to figure out how
|
|
|
|
|
* many spaces to add at the end to pad to the full line width.
|
|
|
|
|
*
|
|
|
|
|
* We'll store the difference between the number of bytes and
|
|
|
|
|
* number of columns, so that removing this from the string length
|
|
|
|
|
* will reveal the total number of columns in the progress bar. */
|
|
|
|
|
nbytes = strlen (eta_trans);
|
|
|
|
|
ncols = count_cols (eta_trans);
|
|
|
|
|
bytes_cols_diff = nbytes - ncols;
|
|
|
|
|
}
|
|
|
|
|
|
2008-04-30 16:48:30 -04:00
|
|
|
|
if (bcd != NULL)
|
|
|
|
|
*bcd = bytes_cols_diff;
|
|
|
|
|
|
2008-02-03 03:53:16 -05:00
|
|
|
|
return eta_trans;
|
|
|
|
|
}
|
|
|
|
|
|
2007-08-02 23:38:21 -04:00
|
|
|
|
#define APPEND_LITERAL(s) do { \
|
|
|
|
|
memcpy (p, s, sizeof (s) - 1); \
|
|
|
|
|
p += sizeof (s) - 1; \
|
2001-12-06 05:45:27 -05:00
|
|
|
|
} while (0)
|
|
|
|
|
|
2005-06-26 08:04:01 -04:00
|
|
|
|
/* Use move_to_end (s) to get S to point the end of the string (the
|
|
|
|
|
terminating \0). This is faster than s+=strlen(s), but some people
|
|
|
|
|
are confused when they see strchr (s, '\0') in the code. */
|
|
|
|
|
#define move_to_end(s) s = strchr (s, '\0');
|
|
|
|
|
|
2001-12-06 05:45:27 -05:00
|
|
|
|
#ifndef MAX
|
|
|
|
|
# define MAX(a, b) ((a) >= (b) ? (a) : (b))
|
|
|
|
|
#endif
|
|
|
|
|
|
2001-11-22 23:59:52 -05:00
|
|
|
|
static void
|
2005-06-25 20:41:09 -04:00
|
|
|
|
create_image (struct bar_progress *bp, double dl_total_time, bool done)
|
2001-11-22 23:59:52 -05:00
|
|
|
|
{
|
|
|
|
|
char *p = bp->buffer;
|
2005-02-23 17:21:04 -05:00
|
|
|
|
wgint size = bp->initial_length + bp->count;
|
2001-11-22 23:59:52 -05:00
|
|
|
|
|
2005-06-25 19:09:29 -04:00
|
|
|
|
const char *size_grouped = with_thousand_seps (size);
|
2008-02-03 03:53:16 -05:00
|
|
|
|
int size_grouped_len = count_cols (size_grouped);
|
|
|
|
|
/* Difference between num cols and num bytes: */
|
|
|
|
|
int size_grouped_diff = strlen (size_grouped) - size_grouped_len;
|
|
|
|
|
int size_grouped_pad; /* Used to pad the field width for size_grouped. */
|
2001-12-06 05:45:27 -05:00
|
|
|
|
|
2002-04-10 10:10:03 -04:00
|
|
|
|
struct bar_progress_hist *hist = &bp->hist;
|
2002-04-09 18:10:01 -04:00
|
|
|
|
|
2001-11-22 23:59:52 -05:00
|
|
|
|
/* The progress bar should look like this:
|
2005-06-25 17:08:04 -04:00
|
|
|
|
xx% [=======> ] nn,nnn 12.34K/s eta 36m 51s
|
2001-11-22 23:59:52 -05:00
|
|
|
|
|
2001-12-06 05:45:27 -05:00
|
|
|
|
Calculate the geometry. The idea is to assign as much room as
|
|
|
|
|
possible to the progress bar. The other idea is to never let
|
|
|
|
|
things "jitter", i.e. pad elements that vary in size so that
|
|
|
|
|
their variance does not affect the placement of other elements.
|
|
|
|
|
It would be especially bad for the progress bar to be resized
|
|
|
|
|
randomly.
|
2001-11-22 23:59:52 -05:00
|
|
|
|
|
2001-12-06 05:45:27 -05:00
|
|
|
|
"xx% " or "100%" - percentage - 4 chars
|
|
|
|
|
"[]" - progress bar decorations - 2 chars
|
|
|
|
|
" nnn,nnn,nnn" - downloaded bytes - 12 chars or very rarely more
|
2005-07-01 20:40:54 -04:00
|
|
|
|
" 12.5K/s" - download rate - 8 chars
|
2008-02-10 17:39:41 -05:00
|
|
|
|
" eta 36m 51s" - ETA - 14 chars
|
2001-11-22 23:59:52 -05:00
|
|
|
|
|
2001-12-06 05:45:27 -05:00
|
|
|
|
"=====>..." - progress bar - the rest
|
2001-11-22 23:59:52 -05:00
|
|
|
|
*/
|
2005-06-25 19:09:29 -04:00
|
|
|
|
int dlbytes_size = 1 + MAX (size_grouped_len, 11);
|
2008-02-10 17:39:41 -05:00
|
|
|
|
int progress_size = bp->width - (4 + 2 + dlbytes_size + 8 + 14);
|
2001-11-22 23:59:52 -05:00
|
|
|
|
|
2008-04-30 16:48:30 -04:00
|
|
|
|
/* The difference between the number of bytes used,
|
|
|
|
|
and the number of columns used. */
|
|
|
|
|
int bytes_cols_diff = 0;
|
|
|
|
|
|
2001-11-24 23:46:26 -05:00
|
|
|
|
if (progress_size < 5)
|
|
|
|
|
progress_size = 0;
|
2001-11-22 23:59:52 -05:00
|
|
|
|
|
2001-11-25 16:03:30 -05:00
|
|
|
|
/* "xx% " */
|
2001-11-22 23:59:52 -05:00
|
|
|
|
if (bp->total_length > 0)
|
|
|
|
|
{
|
2005-06-28 05:09:31 -04:00
|
|
|
|
int percentage = 100.0 * size / bp->total_length;
|
2001-11-22 23:59:52 -05:00
|
|
|
|
assert (percentage <= 100);
|
|
|
|
|
|
2001-11-24 23:46:26 -05:00
|
|
|
|
if (percentage < 100)
|
2007-08-02 23:38:21 -04:00
|
|
|
|
sprintf (p, "%2d%% ", percentage);
|
2001-11-24 23:46:26 -05:00
|
|
|
|
else
|
2007-08-02 23:38:21 -04:00
|
|
|
|
strcpy (p, "100%");
|
2001-11-24 23:46:26 -05:00
|
|
|
|
p += 4;
|
|
|
|
|
}
|
|
|
|
|
else
|
2001-12-06 05:45:27 -05:00
|
|
|
|
APPEND_LITERAL (" ");
|
2001-11-22 23:59:52 -05:00
|
|
|
|
|
2003-09-23 16:48:10 -04:00
|
|
|
|
/* The progress bar: "[====> ]" or "[++==> ]". */
|
2001-11-24 23:46:26 -05:00
|
|
|
|
if (progress_size && bp->total_length > 0)
|
2001-11-22 23:59:52 -05:00
|
|
|
|
{
|
2003-09-22 13:14:19 -04:00
|
|
|
|
/* Size of the initial portion. */
|
|
|
|
|
int insz = (double)bp->initial_length / bp->total_length * progress_size;
|
|
|
|
|
|
|
|
|
|
/* Size of the downloaded portion. */
|
|
|
|
|
int dlsz = (double)size / bp->total_length * progress_size;
|
|
|
|
|
|
2001-11-22 23:59:52 -05:00
|
|
|
|
char *begin;
|
2003-09-22 13:14:19 -04:00
|
|
|
|
int i;
|
2001-11-22 23:59:52 -05:00
|
|
|
|
|
2001-11-24 23:46:26 -05:00
|
|
|
|
assert (dlsz <= progress_size);
|
2003-09-22 13:14:19 -04:00
|
|
|
|
assert (insz <= dlsz);
|
2001-11-22 23:59:52 -05:00
|
|
|
|
|
2001-11-24 23:46:26 -05:00
|
|
|
|
*p++ = '[';
|
2001-11-22 23:59:52 -05:00
|
|
|
|
begin = p;
|
|
|
|
|
|
2003-09-23 16:48:10 -04:00
|
|
|
|
/* Print the initial portion of the download with '+' chars, the
|
2007-08-02 23:38:21 -04:00
|
|
|
|
rest with '=' and one '>'. */
|
2003-09-22 13:14:19 -04:00
|
|
|
|
for (i = 0; i < insz; i++)
|
2007-08-02 23:38:21 -04:00
|
|
|
|
*p++ = '+';
|
2003-09-22 13:14:19 -04:00
|
|
|
|
dlsz -= insz;
|
2001-11-22 23:59:52 -05:00
|
|
|
|
if (dlsz > 0)
|
2007-08-02 23:38:21 -04:00
|
|
|
|
{
|
|
|
|
|
for (i = 0; i < dlsz - 1; i++)
|
|
|
|
|
*p++ = '=';
|
|
|
|
|
*p++ = '>';
|
|
|
|
|
}
|
2001-11-22 23:59:52 -05:00
|
|
|
|
|
2001-11-24 23:46:26 -05:00
|
|
|
|
while (p - begin < progress_size)
|
2007-08-02 23:38:21 -04:00
|
|
|
|
*p++ = ' ';
|
2001-11-24 23:46:26 -05:00
|
|
|
|
*p++ = ']';
|
|
|
|
|
}
|
|
|
|
|
else if (progress_size)
|
|
|
|
|
{
|
|
|
|
|
/* If we can't draw a real progress bar, then at least show
|
2007-08-02 23:38:21 -04:00
|
|
|
|
*something* to the user. */
|
2001-11-24 23:46:26 -05:00
|
|
|
|
int ind = bp->tick % (progress_size * 2 - 6);
|
|
|
|
|
int i, pos;
|
|
|
|
|
|
|
|
|
|
/* Make the star move in two directions. */
|
|
|
|
|
if (ind < progress_size - 2)
|
2007-08-02 23:38:21 -04:00
|
|
|
|
pos = ind + 1;
|
2001-11-24 23:46:26 -05:00
|
|
|
|
else
|
2007-08-02 23:38:21 -04:00
|
|
|
|
pos = progress_size - (ind - progress_size + 5);
|
2001-11-24 23:46:26 -05:00
|
|
|
|
|
|
|
|
|
*p++ = '[';
|
|
|
|
|
for (i = 0; i < progress_size; i++)
|
2007-08-02 23:38:21 -04:00
|
|
|
|
{
|
|
|
|
|
if (i == pos - 1) *p++ = '<';
|
|
|
|
|
else if (i == pos ) *p++ = '=';
|
|
|
|
|
else if (i == pos + 1) *p++ = '>';
|
|
|
|
|
else
|
|
|
|
|
*p++ = ' ';
|
|
|
|
|
}
|
2001-11-24 23:46:26 -05:00
|
|
|
|
*p++ = ']';
|
|
|
|
|
|
|
|
|
|
++bp->tick;
|
2001-11-22 23:59:52 -05:00
|
|
|
|
}
|
|
|
|
|
|
2001-12-06 05:45:27 -05:00
|
|
|
|
/* " 234,567,890" */
|
2008-02-03 03:53:16 -05:00
|
|
|
|
sprintf (p, " %s", size_grouped);
|
2005-06-26 08:04:01 -04:00
|
|
|
|
move_to_end (p);
|
2008-02-03 03:53:16 -05:00
|
|
|
|
/* Pad with spaces to 11 chars for the size_grouped field;
|
|
|
|
|
* couldn't use the field width specifier in sprintf, because
|
|
|
|
|
* it counts in bytes, not characters. */
|
|
|
|
|
for (size_grouped_pad = 11 - size_grouped_len;
|
|
|
|
|
size_grouped_pad > 0;
|
|
|
|
|
--size_grouped_pad)
|
|
|
|
|
{
|
|
|
|
|
*p++ = ' ';
|
|
|
|
|
}
|
2001-11-25 16:03:30 -05:00
|
|
|
|
|
2005-07-01 20:40:54 -04:00
|
|
|
|
/* " 12.52K/s" */
|
2005-07-06 12:35:42 -04:00
|
|
|
|
if (hist->total_time > 0 && hist->total_bytes)
|
2001-11-22 23:59:52 -05:00
|
|
|
|
{
|
2003-12-14 08:35:27 -05:00
|
|
|
|
static const char *short_units[] = { "B/s", "K/s", "M/s", "G/s" };
|
2001-11-24 23:46:26 -05:00
|
|
|
|
int units = 0;
|
2003-09-23 14:39:22 -04:00
|
|
|
|
/* Calculate the download speed using the history ring and
|
2007-08-02 23:38:21 -04:00
|
|
|
|
recent data that hasn't made it to the ring yet. */
|
2005-02-23 17:21:04 -05:00
|
|
|
|
wgint dlquant = hist->total_bytes + bp->recent_bytes;
|
2003-09-23 14:39:22 -04:00
|
|
|
|
double dltime = hist->total_time + (dl_total_time - bp->recent_start);
|
|
|
|
|
double dlspeed = calc_rate (dlquant, dltime, &units);
|
2005-07-01 20:40:54 -04:00
|
|
|
|
sprintf (p, " %4.*f%s", dlspeed >= 99.95 ? 0 : dlspeed >= 9.995 ? 1 : 2,
|
2007-08-02 23:38:21 -04:00
|
|
|
|
dlspeed, short_units[units]);
|
2005-06-26 08:04:01 -04:00
|
|
|
|
move_to_end (p);
|
2001-11-22 23:59:52 -05:00
|
|
|
|
}
|
|
|
|
|
else
|
2005-07-01 20:40:54 -04:00
|
|
|
|
APPEND_LITERAL (" --.-K/s");
|
2001-11-22 23:59:52 -05:00
|
|
|
|
|
2005-06-25 20:41:09 -04:00
|
|
|
|
if (!done)
|
2001-11-22 23:59:52 -05:00
|
|
|
|
{
|
2005-06-25 20:41:09 -04:00
|
|
|
|
/* " eta ..m ..s"; wait for three seconds before displaying the ETA.
|
2007-08-02 23:38:21 -04:00
|
|
|
|
That's because the ETA value needs a while to become
|
|
|
|
|
reliable. */
|
2005-07-06 12:35:42 -04:00
|
|
|
|
if (bp->total_length > 0 && bp->count > 0 && dl_total_time > 3)
|
2007-08-02 23:38:21 -04:00
|
|
|
|
{
|
|
|
|
|
int eta;
|
|
|
|
|
|
|
|
|
|
/* 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 (bp->total_length != size
|
|
|
|
|
&& bp->last_eta_value != 0
|
|
|
|
|
&& dl_total_time - bp->last_eta_time < ETA_REFRESH_INTERVAL)
|
|
|
|
|
eta = bp->last_eta_value;
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* Calculate ETA using the average download speed to predict
|
|
|
|
|
the future speed. If you want to use a speed averaged
|
|
|
|
|
over a more recent period, replace dl_total_time with
|
|
|
|
|
hist->total_time and bp->count with hist->total_bytes.
|
|
|
|
|
I found that doing that results in a very jerky and
|
|
|
|
|
ultimately unreliable ETA. */
|
|
|
|
|
wgint bytes_remaining = bp->total_length - size;
|
|
|
|
|
double eta_ = dl_total_time * bytes_remaining / bp->count;
|
|
|
|
|
if (eta_ >= INT_MAX - 1)
|
|
|
|
|
goto skip_eta;
|
|
|
|
|
eta = (int) (eta_ + 0.5);
|
|
|
|
|
bp->last_eta_value = eta;
|
|
|
|
|
bp->last_eta_time = dl_total_time;
|
|
|
|
|
}
|
|
|
|
|
|
2008-04-30 16:48:30 -04:00
|
|
|
|
sprintf (p, get_eta(&bytes_cols_diff),
|
|
|
|
|
eta_to_human_short (eta, false));
|
2007-08-02 23:38:21 -04:00
|
|
|
|
move_to_end (p);
|
|
|
|
|
}
|
2005-06-25 20:41:09 -04:00
|
|
|
|
else if (bp->total_length > 0)
|
2007-08-02 23:38:21 -04:00
|
|
|
|
{
|
|
|
|
|
skip_eta:
|
|
|
|
|
APPEND_LITERAL (" ");
|
|
|
|
|
}
|
2001-11-22 23:59:52 -05:00
|
|
|
|
}
|
2005-06-25 20:41:09 -04:00
|
|
|
|
else
|
2002-04-10 10:10:03 -04:00
|
|
|
|
{
|
2005-06-25 20:41:09 -04:00
|
|
|
|
/* When the download is done, print the elapsed time. */
|
2008-04-30 16:48:30 -04:00
|
|
|
|
int nbytes;
|
|
|
|
|
int ncols;
|
2005-07-06 12:35:42 -04:00
|
|
|
|
|
2005-06-26 08:04:01 -04:00
|
|
|
|
/* Note to translators: this should not take up more room than
|
2007-08-02 23:38:21 -04:00
|
|
|
|
available here. Abbreviate if necessary. */
|
2005-06-26 08:04:01 -04:00
|
|
|
|
strcpy (p, _(" in "));
|
2008-04-30 16:48:30 -04:00
|
|
|
|
nbytes = strlen (p);
|
|
|
|
|
ncols = count_cols (p);
|
|
|
|
|
bytes_cols_diff = nbytes - ncols;
|
|
|
|
|
p += nbytes;
|
2005-07-06 12:35:42 -04:00
|
|
|
|
if (dl_total_time >= 10)
|
2007-08-02 23:38:21 -04:00
|
|
|
|
strcpy (p, eta_to_human_short ((int) (dl_total_time + 0.5), false));
|
2005-06-26 08:04:01 -04:00
|
|
|
|
else
|
2007-08-02 23:38:21 -04:00
|
|
|
|
sprintf (p, "%ss", print_decimal (dl_total_time));
|
2005-06-26 08:04:01 -04:00
|
|
|
|
move_to_end (p);
|
2002-04-10 10:10:03 -04:00
|
|
|
|
}
|
2001-11-22 23:59:52 -05:00
|
|
|
|
|
2008-02-03 03:53:16 -05:00
|
|
|
|
while (p - bp->buffer - bytes_cols_diff - size_grouped_diff < bp->width)
|
2001-11-22 23:59:52 -05:00
|
|
|
|
*p++ = ' ';
|
|
|
|
|
*p = '\0';
|
|
|
|
|
}
|
|
|
|
|
|
2001-11-23 11:12:53 -05:00
|
|
|
|
/* Print the contents of the buffer as a one-line ASCII "image" so
|
|
|
|
|
that it can be overwritten next time. */
|
|
|
|
|
|
2001-11-22 23:59:52 -05:00
|
|
|
|
static void
|
|
|
|
|
display_image (char *buf)
|
|
|
|
|
{
|
2005-06-22 15:38:10 -04:00
|
|
|
|
bool old = log_set_save_context (false);
|
2001-11-30 03:02:33 -05:00
|
|
|
|
logputs (LOG_VERBOSE, "\r");
|
2001-11-24 23:46:26 -05:00
|
|
|
|
logputs (LOG_VERBOSE, buf);
|
2001-12-10 00:31:45 -05:00
|
|
|
|
log_set_save_context (old);
|
2001-11-22 23:59:52 -05:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
2001-11-23 11:24:06 -05:00
|
|
|
|
bar_set_params (const char *params)
|
2001-11-22 23:59:52 -05:00
|
|
|
|
{
|
2002-05-24 10:53:18 -04:00
|
|
|
|
char *term = getenv ("TERM");
|
2001-11-23 11:12:53 -05:00
|
|
|
|
|
2001-12-06 02:14:35 -05:00
|
|
|
|
if (params
|
|
|
|
|
&& 0 == strcmp (params, "force"))
|
|
|
|
|
current_impl_locked = 1;
|
|
|
|
|
|
2001-11-23 11:24:06 -05:00
|
|
|
|
if ((opt.lfilename
|
2001-11-23 11:12:53 -05:00
|
|
|
|
#ifdef HAVE_ISATTY
|
2002-05-24 10:53:18 -04:00
|
|
|
|
/* The progress bar doesn't make sense if the output is not a
|
2007-08-02 23:38:21 -04:00
|
|
|
|
TTY -- when logging to file, it is better to review the
|
|
|
|
|
dots. */
|
2001-11-23 11:24:06 -05:00
|
|
|
|
|| !isatty (fileno (stderr))
|
2001-11-23 11:12:53 -05:00
|
|
|
|
#endif
|
2002-05-24 10:53:18 -04:00
|
|
|
|
/* Normally we don't depend on terminal type because the
|
2007-08-02 23:38:21 -04:00
|
|
|
|
progress bar only uses ^M to move the cursor to the
|
|
|
|
|
beginning of line, which works even on dumb terminals. But
|
|
|
|
|
Jamie Zawinski reports that ^M and ^H tricks don't work in
|
|
|
|
|
Emacs shell buffers, and only make a mess. */
|
2002-05-24 10:53:18 -04:00
|
|
|
|
|| (term && 0 == strcmp (term, "emacs"))
|
2001-11-23 11:24:06 -05:00
|
|
|
|
)
|
2001-12-06 02:14:35 -05:00
|
|
|
|
&& !current_impl_locked)
|
2001-11-23 11:12:53 -05:00
|
|
|
|
{
|
2001-11-23 11:24:06 -05:00
|
|
|
|
/* We're not printing to a TTY, so revert to the fallback
|
2007-08-02 23:38:21 -04:00
|
|
|
|
display. #### We're recursively calling
|
|
|
|
|
set_progress_implementation here, which is slightly kludgy.
|
|
|
|
|
It would be nicer if we provided that function a return value
|
|
|
|
|
indicating a failure of some sort. */
|
2001-11-27 05:29:45 -05:00
|
|
|
|
set_progress_implementation (FALLBACK_PROGRESS_IMPLEMENTATION);
|
2001-11-23 11:12:53 -05:00
|
|
|
|
return;
|
|
|
|
|
}
|
2001-11-22 23:59:52 -05:00
|
|
|
|
}
|
|
|
|
|
|
2001-12-06 05:45:27 -05:00
|
|
|
|
#ifdef SIGWINCH
|
2005-06-19 19:03:27 -04:00
|
|
|
|
void
|
2001-11-22 23:59:52 -05:00
|
|
|
|
progress_handle_sigwinch (int sig)
|
|
|
|
|
{
|
2003-11-04 08:37:14 -05:00
|
|
|
|
received_sigwinch = 1;
|
2001-12-06 05:45:27 -05:00
|
|
|
|
signal (SIGWINCH, progress_handle_sigwinch);
|
2001-11-22 23:59:52 -05:00
|
|
|
|
}
|
2001-12-06 05:45:27 -05:00
|
|
|
|
#endif
|
2005-06-25 17:08:04 -04:00
|
|
|
|
|
2005-06-26 08:04:01 -04:00
|
|
|
|
/* Provide a short human-readable rendition of the ETA. This is like
|
|
|
|
|
secs_to_human_time in main.c, except the output doesn't include
|
|
|
|
|
fractions (which would look silly in by nature imprecise ETA) and
|
|
|
|
|
takes less room. If the time is measured in hours, hours and
|
|
|
|
|
minutes (but not seconds) are shown; if measured in days, then days
|
|
|
|
|
and hours are shown. This ensures brevity while still displaying
|
|
|
|
|
as much as possible.
|
|
|
|
|
|
2005-06-28 18:03:12 -04:00
|
|
|
|
If CONDENSED is true, the separator between minutes and seconds
|
|
|
|
|
(and hours and minutes, etc.) is not included, shortening the
|
|
|
|
|
display by one additional character. This is used for dot
|
|
|
|
|
progress.
|
2005-06-28 05:09:31 -04:00
|
|
|
|
|
|
|
|
|
The display never occupies more than 7 characters of screen
|
|
|
|
|
space. */
|
2005-06-25 17:08:04 -04:00
|
|
|
|
|
|
|
|
|
static const char *
|
2005-06-28 18:03:12 -04:00
|
|
|
|
eta_to_human_short (int secs, bool condensed)
|
2005-06-25 17:08:04 -04:00
|
|
|
|
{
|
2007-08-02 23:38:21 -04:00
|
|
|
|
static char buf[10]; /* 8 should be enough, but just in case */
|
2005-06-25 17:08:04 -04:00
|
|
|
|
static int last = -1;
|
2005-06-28 18:03:12 -04:00
|
|
|
|
const char *space = condensed ? "" : " ";
|
2005-06-25 17:08:04 -04:00
|
|
|
|
|
2005-06-28 05:09:31 -04:00
|
|
|
|
/* Trivial optimization. create_image can call us every 200 msecs
|
|
|
|
|
(see bar_update) for fast downloads, but ETA will only change
|
|
|
|
|
once per 900 msecs. */
|
2005-06-25 17:08:04 -04:00
|
|
|
|
if (secs == last)
|
|
|
|
|
return buf;
|
|
|
|
|
last = secs;
|
|
|
|
|
|
|
|
|
|
if (secs < 100)
|
2005-06-26 08:04:01 -04:00
|
|
|
|
sprintf (buf, "%ds", secs);
|
2005-06-25 17:08:04 -04:00
|
|
|
|
else if (secs < 100 * 60)
|
2005-06-28 18:03:12 -04:00
|
|
|
|
sprintf (buf, "%dm%s%ds", secs / 60, space, secs % 60);
|
2005-08-11 17:20:37 -04:00
|
|
|
|
else if (secs < 48 * 3600)
|
2005-06-28 18:03:12 -04:00
|
|
|
|
sprintf (buf, "%dh%s%dm", secs / 3600, space, (secs / 60) % 60);
|
2005-06-25 17:08:04 -04:00
|
|
|
|
else if (secs < 100 * 86400)
|
2005-06-28 18:03:12 -04:00
|
|
|
|
sprintf (buf, "%dd%s%dh", secs / 86400, space, (secs / 3600) % 60);
|
2005-06-25 17:08:04 -04:00
|
|
|
|
else
|
2005-06-26 08:04:01 -04:00
|
|
|
|
/* even (2^31-1)/86400 doesn't overflow BUF. */
|
|
|
|
|
sprintf (buf, "%dd", secs / 86400);
|
2005-06-25 17:08:04 -04:00
|
|
|
|
|
|
|
|
|
return buf;
|
|
|
|
|
}
|