2001-11-22 23:59:52 -05:00
|
|
|
|
/* Download progress.
|
|
|
|
|
Copyright (C) 2001 Free Software Foundation, Inc.
|
|
|
|
|
|
|
|
|
|
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
|
|
|
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
|
|
|
\(at your option) any later version.
|
|
|
|
|
|
|
|
|
|
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
|
|
|
|
|
along with Wget; if not, write to the Free Software
|
|
|
|
|
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
|
|
|
|
|
|
|
|
|
|
#include <config.h>
|
|
|
|
|
|
|
|
|
|
#include <stdio.h>
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
|
#ifdef HAVE_STRING_H
|
|
|
|
|
# include <string.h>
|
|
|
|
|
#else
|
|
|
|
|
# include <strings.h>
|
|
|
|
|
#endif /* HAVE_STRING_H */
|
|
|
|
|
#include <assert.h>
|
2001-11-24 22:10:34 -05:00
|
|
|
|
#ifdef HAVE_UNISTD_H
|
|
|
|
|
# include <unistd.h>
|
|
|
|
|
#endif
|
2001-11-22 23:59:52 -05:00
|
|
|
|
|
|
|
|
|
#include "wget.h"
|
|
|
|
|
#include "progress.h"
|
|
|
|
|
#include "utils.h"
|
|
|
|
|
#include "retr.h"
|
|
|
|
|
|
|
|
|
|
struct progress_implementation {
|
|
|
|
|
char *name;
|
|
|
|
|
void *(*create) (long, long);
|
|
|
|
|
void (*update) (void *, long);
|
|
|
|
|
void (*finish) (void *);
|
|
|
|
|
void (*set_params) (const char *);
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* Necessary forward declarations. */
|
|
|
|
|
|
2001-11-23 11:12:53 -05:00
|
|
|
|
static void *dot_create PARAMS ((long, long));
|
|
|
|
|
static void dot_update PARAMS ((void *, long));
|
|
|
|
|
static void dot_finish PARAMS ((void *));
|
|
|
|
|
static void dot_set_params PARAMS ((const char *));
|
2001-11-22 23:59:52 -05:00
|
|
|
|
|
|
|
|
|
static void *bar_create PARAMS ((long, long));
|
|
|
|
|
static void bar_update PARAMS ((void *, long));
|
|
|
|
|
static void bar_finish PARAMS ((void *));
|
|
|
|
|
static void bar_set_params PARAMS ((const char *));
|
|
|
|
|
|
|
|
|
|
static struct progress_implementation implementations[] = {
|
2001-11-23 11:12:53 -05:00
|
|
|
|
{ "dot", dot_create, dot_update, dot_finish, dot_set_params },
|
2001-11-22 23:59:52 -05:00
|
|
|
|
{ "bar", bar_create, bar_update, bar_finish, bar_set_params }
|
|
|
|
|
};
|
|
|
|
|
static struct progress_implementation *current_impl;
|
|
|
|
|
|
2001-11-23 11:12:53 -05:00
|
|
|
|
/* Default progress implementation should be something that works
|
|
|
|
|
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. */
|
|
|
|
|
|
|
|
|
|
#define DEFAULT_PROGRESS_IMPLEMENTATION "dot"
|
|
|
|
|
|
2001-11-22 23:59:52 -05:00
|
|
|
|
/* Return non-zero if NAME names a valid progress bar implementation.
|
|
|
|
|
The characters after the first : will be ignored. */
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
valid_progress_implementation_p (const char *name)
|
|
|
|
|
{
|
|
|
|
|
int i = 0;
|
|
|
|
|
struct progress_implementation *pi = implementations;
|
|
|
|
|
char *colon = strchr (name, ':');
|
|
|
|
|
int namelen = colon ? colon - name : strlen (name);
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < ARRAY_SIZE (implementations); i++, pi++)
|
|
|
|
|
if (!strncmp (pi->name, name, namelen))
|
|
|
|
|
return 1;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Set the progress implementation to NAME. */
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
set_progress_implementation (const char *name)
|
|
|
|
|
{
|
2001-11-23 11:12:53 -05:00
|
|
|
|
int i, namelen;
|
2001-11-22 23:59:52 -05:00
|
|
|
|
struct progress_implementation *pi = implementations;
|
2001-11-23 11:12:53 -05:00
|
|
|
|
char *colon;
|
|
|
|
|
|
|
|
|
|
if (!name)
|
|
|
|
|
name = DEFAULT_PROGRESS_IMPLEMENTATION;
|
|
|
|
|
|
|
|
|
|
colon = strchr (name, ':');
|
|
|
|
|
namelen = colon ? colon - name : strlen (name);
|
2001-11-22 23:59:52 -05:00
|
|
|
|
|
|
|
|
|
for (i = 0; i < ARRAY_SIZE (implementations); i++, pi++)
|
|
|
|
|
if (!strncmp (pi->name, name, namelen))
|
|
|
|
|
{
|
|
|
|
|
current_impl = pi;
|
|
|
|
|
|
|
|
|
|
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;
|
|
|
|
|
}
|
|
|
|
|
abort ();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* 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 *
|
|
|
|
|
progress_create (long initial, long total)
|
|
|
|
|
{
|
|
|
|
|
return current_impl->create (initial, total);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Inform the progress gauge of newly received bytes. */
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
progress_update (void *progress, long howmuch)
|
|
|
|
|
{
|
|
|
|
|
current_impl->update (progress, howmuch);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Tell the progress gauge to clean up. Calling this will free the
|
|
|
|
|
PROGRESS object, the further use of which is not allowed. */
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
progress_finish (void *progress)
|
|
|
|
|
{
|
|
|
|
|
current_impl->finish (progress);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Dot-printing. */
|
|
|
|
|
|
|
|
|
|
struct dot_progress {
|
|
|
|
|
long initial_length; /* how many bytes have been downloaded
|
|
|
|
|
previously. */
|
|
|
|
|
long total_length; /* expected total byte count when the
|
|
|
|
|
download finishes */
|
|
|
|
|
|
|
|
|
|
int accumulated;
|
|
|
|
|
|
|
|
|
|
int rows; /* number of rows printed so far */
|
|
|
|
|
int dots; /* number of dots printed in this row */
|
|
|
|
|
|
|
|
|
|
struct wget_timer *timer; /* timer used to measure per-row
|
|
|
|
|
download rates. */
|
|
|
|
|
long last_timer_value;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* Dot-progress backend for progress_create. */
|
|
|
|
|
|
|
|
|
|
static void *
|
2001-11-23 11:12:53 -05:00
|
|
|
|
dot_create (long initial, long total)
|
2001-11-22 23:59:52 -05:00
|
|
|
|
{
|
|
|
|
|
struct dot_progress *dp = xmalloc (sizeof (struct dot_progress));
|
|
|
|
|
|
|
|
|
|
memset (dp, 0, sizeof (*dp));
|
|
|
|
|
|
|
|
|
|
dp->initial_length = initial;
|
|
|
|
|
dp->total_length = total;
|
|
|
|
|
dp->timer = wtimer_new ();
|
|
|
|
|
|
|
|
|
|
if (dp->initial_length)
|
|
|
|
|
{
|
|
|
|
|
int dot_bytes = opt.dot_bytes;
|
|
|
|
|
long row_bytes = opt.dot_bytes * opt.dots_in_line;
|
|
|
|
|
|
|
|
|
|
int remainder = (int) (dp->initial_length % row_bytes);
|
|
|
|
|
long skipped = dp->initial_length - remainder;
|
|
|
|
|
|
|
|
|
|
if (skipped)
|
|
|
|
|
{
|
2001-11-24 23:46:26 -05:00
|
|
|
|
int skipped_k = (int) (skipped / 1024); /* skipped amount in K */
|
|
|
|
|
int skipped_k_len = numdigit (skipped_k);
|
|
|
|
|
if (skipped_k_len < 5)
|
|
|
|
|
skipped_k_len = 5;
|
|
|
|
|
|
|
|
|
|
/* 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%s",
|
|
|
|
|
2 + skipped_k_len, "", _("[ skipping %dK ]"));
|
2001-11-22 23:59:52 -05:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
logprintf (LOG_VERBOSE, "\n%5ldK", skipped / 1024);
|
|
|
|
|
for (; remainder >= dot_bytes; remainder -= dot_bytes)
|
|
|
|
|
{
|
|
|
|
|
if (dp->dots % opt.dot_spacing == 0)
|
|
|
|
|
logputs (LOG_VERBOSE, " ");
|
|
|
|
|
logputs (LOG_VERBOSE, ",");
|
|
|
|
|
++dp->dots;
|
|
|
|
|
}
|
|
|
|
|
assert (dp->dots < opt.dots_in_line);
|
|
|
|
|
|
|
|
|
|
dp->accumulated = remainder;
|
|
|
|
|
dp->rows = skipped / row_bytes;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return dp;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
print_percentage (long bytes, long expected)
|
|
|
|
|
{
|
|
|
|
|
int percentage = (int)(100.0 * bytes / expected);
|
|
|
|
|
logprintf (LOG_VERBOSE, "%3d%%", percentage);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
2001-11-23 11:12:53 -05:00
|
|
|
|
print_download_speed (struct dot_progress *dp, long bytes)
|
2001-11-22 23:59:52 -05:00
|
|
|
|
{
|
|
|
|
|
long timer_value = wtimer_elapsed (dp->timer);
|
2001-11-23 11:12:53 -05:00
|
|
|
|
logprintf (LOG_VERBOSE, " %s",
|
2001-11-24 23:46:26 -05:00
|
|
|
|
retr_rate (bytes, timer_value - dp->last_timer_value, 1));
|
2001-11-22 23:59:52 -05:00
|
|
|
|
dp->last_timer_value = timer_value;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Dot-progress backend for progress_update. */
|
|
|
|
|
|
|
|
|
|
static void
|
2001-11-23 11:12:53 -05:00
|
|
|
|
dot_update (void *progress, long howmuch)
|
2001-11-22 23:59:52 -05:00
|
|
|
|
{
|
|
|
|
|
struct dot_progress *dp = progress;
|
|
|
|
|
int dot_bytes = opt.dot_bytes;
|
|
|
|
|
long row_bytes = opt.dot_bytes * opt.dots_in_line;
|
|
|
|
|
|
|
|
|
|
log_set_flush (0);
|
|
|
|
|
|
|
|
|
|
dp->accumulated += howmuch;
|
|
|
|
|
for (; dp->accumulated >= dot_bytes; dp->accumulated -= dot_bytes)
|
|
|
|
|
{
|
|
|
|
|
if (dp->dots == 0)
|
|
|
|
|
logprintf (LOG_VERBOSE, "\n%5ldK", dp->rows * row_bytes / 1024);
|
|
|
|
|
|
|
|
|
|
if (dp->dots % opt.dot_spacing == 0)
|
|
|
|
|
logputs (LOG_VERBOSE, " ");
|
|
|
|
|
logputs (LOG_VERBOSE, ".");
|
|
|
|
|
|
|
|
|
|
++dp->dots;
|
|
|
|
|
if (dp->dots >= opt.dots_in_line)
|
|
|
|
|
{
|
|
|
|
|
++dp->rows;
|
|
|
|
|
dp->dots = 0;
|
|
|
|
|
|
|
|
|
|
if (dp->total_length)
|
|
|
|
|
print_percentage (dp->rows * row_bytes, dp->total_length);
|
|
|
|
|
|
2001-11-23 11:12:53 -05:00
|
|
|
|
print_download_speed (dp,
|
|
|
|
|
row_bytes - (dp->initial_length % row_bytes));
|
2001-11-22 23:59:52 -05:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
log_set_flush (1);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Dot-progress backend for progress_finish. */
|
|
|
|
|
|
|
|
|
|
static void
|
2001-11-23 11:12:53 -05:00
|
|
|
|
dot_finish (void *progress)
|
2001-11-22 23:59:52 -05:00
|
|
|
|
{
|
|
|
|
|
struct dot_progress *dp = progress;
|
|
|
|
|
int dot_bytes = opt.dot_bytes;
|
|
|
|
|
long row_bytes = opt.dot_bytes * opt.dots_in_line;
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
log_set_flush (0);
|
|
|
|
|
|
|
|
|
|
for (i = dp->dots; i < opt.dots_in_line; i++)
|
|
|
|
|
{
|
|
|
|
|
if (i % opt.dot_spacing == 0)
|
|
|
|
|
logputs (LOG_VERBOSE, " ");
|
|
|
|
|
logputs (LOG_VERBOSE, " ");
|
|
|
|
|
}
|
|
|
|
|
if (dp->total_length)
|
|
|
|
|
{
|
|
|
|
|
print_percentage (dp->rows * row_bytes
|
|
|
|
|
+ dp->dots * dot_bytes
|
|
|
|
|
+ dp->accumulated,
|
|
|
|
|
dp->total_length);
|
|
|
|
|
}
|
|
|
|
|
|
2001-11-23 11:12:53 -05:00
|
|
|
|
print_download_speed (dp, dp->dots * dot_bytes
|
|
|
|
|
+ dp->accumulated
|
|
|
|
|
- dp->initial_length % row_bytes);
|
2001-11-22 23:59:52 -05:00
|
|
|
|
logputs (LOG_VERBOSE, "\n\n");
|
|
|
|
|
|
|
|
|
|
log_set_flush (0);
|
|
|
|
|
|
|
|
|
|
wtimer_delete (dp->timer);
|
|
|
|
|
xfree (dp);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* This function interprets the progress "parameters". For example,
|
|
|
|
|
if Wget is invoked with --progress=bar:mega, it will set the
|
|
|
|
|
"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
|
|
|
|
{
|
|
|
|
|
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
|
|
|
|
|
line. */
|
|
|
|
|
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
|
|
|
|
|
(384K) in a line. */
|
|
|
|
|
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
|
|
|
|
|
64K, 8 dots in a cluster, 6 clusters (3M) in a line. */
|
|
|
|
|
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;
|
|
|
|
|
each dot is 1M, 8 dots in a cluster, 4 clusters (32M) in a
|
|
|
|
|
line. */
|
|
|
|
|
opt.dot_bytes = (1L << 20);
|
|
|
|
|
opt.dot_spacing = 8;
|
|
|
|
|
opt.dots_in_line = 32;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
fprintf (stderr,
|
|
|
|
|
_("Invalid dot style specification `%s'; leaving unchanged.\n"),
|
|
|
|
|
params);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* "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
|
|
|
|
|
|
|
|
|
|
static int screen_width = DEFAULT_SCREEN_WIDTH;
|
|
|
|
|
|
|
|
|
|
struct bar_progress {
|
|
|
|
|
long initial_length; /* how many bytes have been downloaded
|
|
|
|
|
previously. */
|
|
|
|
|
long total_length; /* expected total byte count when the
|
|
|
|
|
download finishes */
|
|
|
|
|
long count; /* bytes downloaded so far */
|
|
|
|
|
|
|
|
|
|
struct wget_timer *timer; /* timer used to measure the download
|
|
|
|
|
rates. */
|
|
|
|
|
long last_update; /* time of the last screen update. */
|
|
|
|
|
|
|
|
|
|
int width; /* screen width at the time the
|
|
|
|
|
progress gauge was created. */
|
|
|
|
|
char *buffer; /* buffer where the bar "image" is
|
|
|
|
|
stored. */
|
2001-11-24 23:46:26 -05:00
|
|
|
|
|
|
|
|
|
int tick;
|
2001-11-22 23:59:52 -05:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static void create_image PARAMS ((struct bar_progress *, long));
|
|
|
|
|
static void display_image PARAMS ((char *));
|
|
|
|
|
|
|
|
|
|
static void *
|
|
|
|
|
bar_create (long initial, long total)
|
|
|
|
|
{
|
|
|
|
|
struct bar_progress *bp = xmalloc (sizeof (struct bar_progress));
|
|
|
|
|
|
|
|
|
|
memset (bp, 0, sizeof (*bp));
|
|
|
|
|
|
|
|
|
|
bp->initial_length = initial;
|
|
|
|
|
bp->total_length = total;
|
|
|
|
|
bp->timer = wtimer_new ();
|
|
|
|
|
bp->width = screen_width;
|
|
|
|
|
bp->buffer = xmalloc (bp->width + 1);
|
|
|
|
|
|
|
|
|
|
logputs (LOG_VERBOSE, "\n");
|
|
|
|
|
|
|
|
|
|
create_image (bp, 0);
|
|
|
|
|
display_image (bp->buffer);
|
|
|
|
|
|
|
|
|
|
return bp;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
bar_update (void *progress, long howmuch)
|
|
|
|
|
{
|
|
|
|
|
struct bar_progress *bp = progress;
|
|
|
|
|
int force_update = 0;
|
|
|
|
|
long dltime = wtimer_elapsed (bp->timer);
|
|
|
|
|
|
|
|
|
|
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. */
|
|
|
|
|
bp->total_length = bp->count + bp->initial_length;
|
2001-11-22 23:59:52 -05:00
|
|
|
|
|
|
|
|
|
if (screen_width != bp->width)
|
|
|
|
|
{
|
|
|
|
|
bp->width = screen_width;
|
|
|
|
|
bp->buffer = xrealloc (bp->buffer, bp->width + 1);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (dltime - bp->last_update < 200 && !force_update)
|
|
|
|
|
/* Don't update more often than every half a second. */
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
bp->last_update = dltime;
|
|
|
|
|
|
|
|
|
|
create_image (bp, dltime);
|
|
|
|
|
display_image (bp->buffer);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
bar_finish (void *progress)
|
|
|
|
|
{
|
|
|
|
|
struct bar_progress *bp = progress;
|
2001-11-23 21:38:47 -05:00
|
|
|
|
long elapsed = wtimer_elapsed (bp->timer);
|
2001-11-22 23:59:52 -05:00
|
|
|
|
|
2001-11-23 21:38:47 -05:00
|
|
|
|
if (elapsed == 0)
|
|
|
|
|
/* If the download was faster than the granularity of the timer,
|
|
|
|
|
fake some output so that we don't get the ugly "----.--" rate
|
|
|
|
|
at the download finish. */
|
|
|
|
|
elapsed = 1;
|
|
|
|
|
|
|
|
|
|
create_image (bp, elapsed);
|
2001-11-22 23:59:52 -05:00
|
|
|
|
display_image (bp->buffer);
|
|
|
|
|
|
|
|
|
|
logputs (LOG_VERBOSE, "\n\n");
|
|
|
|
|
|
|
|
|
|
xfree (bp->buffer);
|
|
|
|
|
wtimer_delete (bp->timer);
|
|
|
|
|
xfree (bp);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
create_image (struct bar_progress *bp, long dltime)
|
|
|
|
|
{
|
|
|
|
|
char *p = bp->buffer;
|
|
|
|
|
long size = bp->initial_length + bp->count;
|
|
|
|
|
|
|
|
|
|
/* The progress bar should look like this:
|
2001-11-25 16:03:30 -05:00
|
|
|
|
xx% [=======> ] nn.nnn rrK/s ETA 00:00
|
2001-11-22 23:59:52 -05:00
|
|
|
|
|
|
|
|
|
Calculate its geometry:
|
|
|
|
|
|
2001-11-25 16:03:30 -05:00
|
|
|
|
"xx% " or "100%" - percentage - 4 chars exactly
|
|
|
|
|
"[]" - progress bar decorations - 2 chars exactly
|
|
|
|
|
" n,nnn,nnn,nnn" - downloaded bytes - 14 or less chars
|
|
|
|
|
" 1012.56K/s" - dl rate - 11 chars exactly
|
|
|
|
|
" ETA xx:xx:xx" - ETA - 13 or less chars
|
2001-11-22 23:59:52 -05:00
|
|
|
|
|
2001-11-25 16:03:30 -05:00
|
|
|
|
"=====>..." - progress bar content - the rest
|
2001-11-22 23:59:52 -05:00
|
|
|
|
*/
|
2001-11-25 16:03:30 -05:00
|
|
|
|
int progress_size = screen_width - (4 + 2 + 14 + 11 + 13);
|
2001-11-22 23:59:52 -05:00
|
|
|
|
|
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)
|
|
|
|
|
{
|
|
|
|
|
int percentage = (int)(100.0 * size / bp->total_length);
|
|
|
|
|
|
|
|
|
|
assert (percentage <= 100);
|
|
|
|
|
|
2001-11-24 23:46:26 -05:00
|
|
|
|
if (percentage < 100)
|
|
|
|
|
sprintf (p, "%2d%% ", percentage);
|
|
|
|
|
else
|
|
|
|
|
strcpy (p, "100%");
|
|
|
|
|
p += 4;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2001-11-25 16:03:30 -05:00
|
|
|
|
*p++ = ' ';
|
|
|
|
|
*p++ = ' ';
|
|
|
|
|
*p++ = ' ';
|
|
|
|
|
*p++ = ' ';
|
2001-11-22 23:59:52 -05:00
|
|
|
|
}
|
|
|
|
|
|
2001-11-25 16:03:30 -05:00
|
|
|
|
/* The progress bar: "[====> ]" */
|
2001-11-24 23:46:26 -05:00
|
|
|
|
if (progress_size && bp->total_length > 0)
|
2001-11-22 23:59:52 -05:00
|
|
|
|
{
|
|
|
|
|
double fraction = (double)size / bp->total_length;
|
2001-11-24 23:46:26 -05:00
|
|
|
|
int dlsz = (int)(fraction * progress_size);
|
2001-11-22 23:59:52 -05:00
|
|
|
|
char *begin;
|
|
|
|
|
|
2001-11-24 23:46:26 -05:00
|
|
|
|
assert (dlsz <= progress_size);
|
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;
|
|
|
|
|
|
|
|
|
|
if (dlsz > 0)
|
|
|
|
|
{
|
|
|
|
|
/* Draw dlsz-1 '=' chars and one arrow char. */
|
|
|
|
|
while (dlsz-- > 1)
|
|
|
|
|
*p++ = '=';
|
|
|
|
|
*p++ = '>';
|
|
|
|
|
}
|
|
|
|
|
|
2001-11-24 23:46:26 -05:00
|
|
|
|
while (p - begin < progress_size)
|
2001-11-22 23:59:52 -05: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
|
|
|
|
|
*something* to the user. */
|
|
|
|
|
int ind = bp->tick % (progress_size * 2 - 6);
|
|
|
|
|
int i, pos;
|
|
|
|
|
|
|
|
|
|
/* Make the star move in two directions. */
|
|
|
|
|
if (ind < progress_size - 2)
|
|
|
|
|
pos = ind + 1;
|
|
|
|
|
else
|
|
|
|
|
pos = progress_size - (ind - progress_size + 5);
|
|
|
|
|
|
|
|
|
|
*p++ = '[';
|
|
|
|
|
for (i = 0; i < progress_size; i++)
|
|
|
|
|
{
|
|
|
|
|
if (i == pos - 1) *p++ = '<';
|
|
|
|
|
else if (i == pos ) *p++ = '=';
|
|
|
|
|
else if (i == pos + 1) *p++ = '>';
|
|
|
|
|
else
|
|
|
|
|
*p++ = ' ';
|
|
|
|
|
}
|
|
|
|
|
*p++ = ']';
|
|
|
|
|
|
|
|
|
|
++bp->tick;
|
2001-11-22 23:59:52 -05:00
|
|
|
|
}
|
|
|
|
|
|
2001-11-25 16:03:30 -05:00
|
|
|
|
/* " 1,234,567" */
|
|
|
|
|
/* If there are 7 or less digits (9 because of "legible" comas),
|
|
|
|
|
print the number in constant space. This will prevent the rest
|
|
|
|
|
of the line jerking at the beginning of download, but without
|
|
|
|
|
assigning maximum width in all cases. */
|
|
|
|
|
sprintf (p, " %9s", legible (size));
|
|
|
|
|
p += strlen (p);
|
|
|
|
|
|
|
|
|
|
/* " 1012.45K/s" */
|
2001-11-22 23:59:52 -05:00
|
|
|
|
if (dltime && bp->count)
|
|
|
|
|
{
|
2001-11-24 23:46:26 -05:00
|
|
|
|
static char *short_units[] = { "B/s", "K/s", "M/s", "G/s" };
|
|
|
|
|
int units = 0;
|
|
|
|
|
double dlrate = calc_rate (bp->count, dltime, &units);
|
2001-11-25 16:03:30 -05:00
|
|
|
|
sprintf (p, " %7.2f%s", dlrate, short_units[units]);
|
2001-11-22 23:59:52 -05:00
|
|
|
|
p += strlen (p);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2001-11-25 16:03:30 -05:00
|
|
|
|
strcpy (p, " --.--K/s");
|
|
|
|
|
p += 11;
|
2001-11-22 23:59:52 -05:00
|
|
|
|
}
|
|
|
|
|
|
2001-11-25 16:03:30 -05:00
|
|
|
|
/* " ETA xx:xx:xx" */
|
2001-11-22 23:59:52 -05:00
|
|
|
|
if (bp->total_length > 0 && bp->count > 0)
|
|
|
|
|
{
|
|
|
|
|
int eta, eta_hrs, eta_min, eta_sec;
|
|
|
|
|
double tm_sofar = (double)dltime / 1000;
|
|
|
|
|
long bytes_remaining = bp->total_length - size;
|
|
|
|
|
|
|
|
|
|
eta = (int) (tm_sofar * bytes_remaining / bp->count);
|
|
|
|
|
|
|
|
|
|
eta_hrs = eta / 3600, eta %= 3600;
|
|
|
|
|
eta_min = eta / 60, eta %= 60;
|
|
|
|
|
eta_sec = eta;
|
|
|
|
|
|
|
|
|
|
/*printf ("\neta: %d, %d %d %d\n", eta, eta_hrs, eta_min, eta_sec);*/
|
|
|
|
|
/*printf ("\n%ld %f %ld %ld\n", dltime, tm_sofar, bytes_remaining, bp->count);*/
|
|
|
|
|
|
2001-11-25 16:03:30 -05:00
|
|
|
|
*p++ = ' ';
|
2001-11-22 23:59:52 -05:00
|
|
|
|
*p++ = 'E';
|
|
|
|
|
*p++ = 'T';
|
|
|
|
|
*p++ = 'A';
|
|
|
|
|
*p++ = ' ';
|
|
|
|
|
|
|
|
|
|
if (eta_hrs > 99)
|
|
|
|
|
/* Bogus value, for whatever reason. We must avoid overflow. */
|
|
|
|
|
sprintf (p, "--:--");
|
|
|
|
|
else if (eta_hrs > 0)
|
|
|
|
|
sprintf (p, "%d:%02d:%02d", eta_hrs, eta_min, eta_sec);
|
|
|
|
|
else
|
|
|
|
|
sprintf (p, "%02d:%02d", eta_min, eta_sec);
|
|
|
|
|
p += strlen (p);
|
|
|
|
|
}
|
|
|
|
|
else if (bp->total_length > 0)
|
|
|
|
|
{
|
2001-11-25 16:03:30 -05:00
|
|
|
|
strcpy (p, " ETA --:--");
|
|
|
|
|
p += 10;
|
2001-11-22 23:59:52 -05:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
assert (p - bp->buffer <= screen_width);
|
|
|
|
|
|
|
|
|
|
while (p < bp->buffer + screen_width)
|
|
|
|
|
*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)
|
|
|
|
|
{
|
2001-11-24 23:46:26 -05:00
|
|
|
|
char *del_buf = alloca (screen_width + 1);
|
|
|
|
|
memset (del_buf, '\b', screen_width);
|
|
|
|
|
del_buf[screen_width] = '\0';
|
2001-11-22 23:59:52 -05:00
|
|
|
|
logputs (LOG_VERBOSE, del_buf);
|
2001-11-24 23:46:26 -05:00
|
|
|
|
logputs (LOG_VERBOSE, buf);
|
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
|
|
|
|
{
|
2001-11-23 11:12:53 -05:00
|
|
|
|
int sw;
|
|
|
|
|
|
2001-11-23 11:24:06 -05:00
|
|
|
|
if ((opt.lfilename
|
2001-11-23 11:12:53 -05:00
|
|
|
|
#ifdef HAVE_ISATTY
|
2001-11-23 11:24:06 -05:00
|
|
|
|
|| !isatty (fileno (stderr))
|
2001-11-23 11:12:53 -05:00
|
|
|
|
#else
|
2001-11-23 11:24:06 -05:00
|
|
|
|
1
|
2001-11-23 11:12:53 -05:00
|
|
|
|
#endif
|
2001-11-23 11:24:06 -05:00
|
|
|
|
)
|
|
|
|
|
&& !(params != NULL
|
|
|
|
|
&& 0 == strcmp (params, "force")))
|
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
|
|
|
|
|
display. #### We're recursively calling
|
|
|
|
|
set_progress_implementation here, which is slightly kludgy.
|
|
|
|
|
It would be nicer if that function could resolve this problem
|
|
|
|
|
itself. */
|
2001-11-23 11:12:53 -05:00
|
|
|
|
set_progress_implementation (NULL);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
sw = determine_screen_width ();
|
2001-11-22 23:59:52 -05:00
|
|
|
|
if (sw && sw >= MINIMUM_SCREEN_WIDTH)
|
|
|
|
|
screen_width = sw;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
RETSIGTYPE
|
|
|
|
|
progress_handle_sigwinch (int sig)
|
|
|
|
|
{
|
|
|
|
|
int sw = determine_screen_width ();
|
|
|
|
|
if (sw && sw >= MINIMUM_SCREEN_WIDTH)
|
|
|
|
|
screen_width = sw;
|
|
|
|
|
}
|