moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2025-03-03 10:51:47 -05:00
Code Issues Releases Wiki Activity

callback.c : less magic progress bars

Browse Source 
1 - Explain magic numbers

2 - There was a weird off by 1 mess in the progress bar. The code supposedly
shared the width between 50 chars for text (textlen) and the rest for the
progress bar (proglen = getcols() - textlen).
But the code actually used textlen + 1 for the text and proglen - 1 for the
progress bar (with haslen=1, the progress bar was actually empty), which was
a bit confusing so I changed it.

Signed-off-by: Xavier Chantry <shiningxc@gmail.com>
Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Xavier Chantry 2009-12-16 02:16:00 +01:00 committed by Dan McGee
parent 087be2f1fb
commit e5dce888c0
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/pacman/callback.c
View File

@ -90,20 +90,20 @@ static float get_update_timediff(int first_call)
static void fill_progress(const int bar_percent, const int disp_percent,
const int proglen)
{
const unsigned int hashlen = proglen - 8;
const unsigned int hash = bar_percent * hashlen / 100;
static unsigned int lasthash = 0, mouth = 0;
unsigned int i;
/* 8 = 1 space + 1 [ + 1 ] + 5 for percent */
const int hashlen = proglen - 8;
const int hash = bar_percent * hashlen / 100;
static int lasthash = 0, mouth = 0;
int i;
if(bar_percent == 0) {
lasthash = 0;
mouth = 0;
}
/* magic numbers, how I loathe thee */
if(proglen > 8) {
if(hashlen > 0) {
printf(" [");
for(i = hashlen; i > 1; --i) {
for(i = hashlen; i > 0; --i) {
/* if special progress bar enabled */
if(config->chomp) {
if(i > hashlen - hash) {
@ -139,7 +139,8 @@ static void fill_progress(const int bar_percent, const int disp_percent,
printf("]");
}
/* print display percent after progress bar */
if(proglen > 5) {
/* 5 = 1 space + 3 digits + 1 % */
if(proglen >= 5) {
printf(" %3d%%", disp_percent);
}
@ -374,7 +375,7 @@ void cb_trans_progress(pmtransprog_t event, const char *pkgname, int percent,
++digits;
}
/* determine room left for non-digits text [not ( 1/12) part] */
textlen = infolen - 3 - (2 * digits);
textlen = infolen - 3 /* (/) */ - (2 * digits) - 1 /* space */;
/* In order to deal with characters from all locales, we have to worry
* about wide characters and their column widths. A lot of stuff is
@ -449,7 +450,8 @@ void cb_dl_total(off_t total)
void cb_dl_progress(const char *filename, off_t file_xfered, off_t file_total)
{
const int infolen = 50;
const int filenamelen = infolen - 27;
/* explanation of magic 28 number at the end */
const int filenamelen = infolen - 28;
char *fname, *p;
/* used for wide character width determination and printing */
int len, wclen, wcwid, padwid;
@ -611,6 +613,7 @@ void cb_dl_progress(const char *filename, off_t file_xfered, off_t file_total)
}
}
/* 1 space + filenamelen + 1 space + 7 for size + 1 + 7 for rate + 2 for /s + 1 space + 8 for eta */
printf(" %ls%-*s %6.1f%c %#6.1f%c/s %02u:%02u:%02u", wcfname,
padwid, "", f_xfered, xfered_size,
rate, rate_size, eta_h, eta_m, eta_s);