bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Ensure progress callback updates if XX/YY numerator changes

Browse source 
We only updated if the percentage incremented and enough time had
elapsed, even though the numerator of the current/howmany fraction may
have changed. Ensure we proceed with the progress bar update in these
cases so as to not mislead the user.

Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Dan McGee 2011-08-29 16:23:06 -05:00
parent 8129b93afe
commit 515720a6fc
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/pacman/callback.c
View file

@ -43,9 +43,6 @@ static off_t list_xfered = 0.0;
static off_t list_total = 0.0; static off_t list_total = 0.0;
static struct timeval initial_time; static struct timeval initial_time;
/* transaction progress bar */
static int prevpercent = 0; /* for less progressbar output */
/* delayed output during progress bar */ /* delayed output during progress bar */
static int on_progress = 0; static int on_progress = 0;
static alpm_list_t *output = NULL; static alpm_list_t *output = NULL;
@ -349,6 +346,8 @@ void cb_trans_conv(alpm_transconv_t event, void *data1, void *data2,
void cb_trans_progress(alpm_transprog_t event, const char *pkgname, int percent, void cb_trans_progress(alpm_transprog_t event, const char *pkgname, int percent,
size_t howmany, size_t current) size_t howmany, size_t current)
{ {
static int prevpercent;
static size_t prevcurrent;
/* size of line to allocate for text printing (e.g. not progressbar) */ /* size of line to allocate for text printing (e.g. not progressbar) */
int infolen; int infolen;
int digits, textlen; int digits, textlen;
@ -373,14 +372,18 @@ void cb_trans_progress(alpm_transprog_t event, const char *pkgname, int percent,
return; return;
} }
} else { } else {
if(!pkgname || percent == prevpercent || get_update_timediff(0) < UPDATE_SPEED_SEC) { if(current != prevcurrent) {
/* update always */
} else if(!pkgname || percent == prevpercent ||
get_update_timediff(0) < UPDATE_SPEED_SEC) {
/* only update the progress bar when we have a package name, the /* only update the progress bar when we have a package name, the
* percentage has changed, and it has been long enough. */ * percentage has changed, and it has been long enough. */
return; return;
} }
} }
prevpercent = percent; prevpercent = percent;
prevcurrent = current;
/* set text of message to display */ /* set text of message to display */
switch (event) { switch (event) {