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

pacman: total download show how many packages have been download

Browse source 
Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
morganamilo 2021-01-01 16:57:48 +00:00 • committed by Allan McRae
parent b9ab7790d5
commit 4472ce55d7
1 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/pacman/callback.c
View file

@ -42,6 +42,7 @@
/* download progress bar */ /* download progress bar */
static int total_enabled = 0; static int total_enabled = 0;
static off_t list_total = 0.0; static off_t list_total = 0.0;
static size_t list_total_pkgs = 0;
static struct pacman_progress_bar *totalbar; static struct pacman_progress_bar *totalbar;
/* delayed output during progress bar */ /* delayed output during progress bar */
@ -59,6 +60,8 @@ struct pacman_progress_bar {
const char *filename; const char *filename;
off_t xfered; /* Current amount of transferred data */ off_t xfered; /* Current amount of transferred data */
off_t total_size; off_t total_size;
size_t downloaded;
size_t howmany;
uint64_t init_time; /* Time when this download started doing any progress */ uint64_t init_time; /* Time when this download started doing any progress */
uint64_t sync_time; /* Last time we updated the bar info */ uint64_t sync_time; /* Last time we updated the bar info */
off_t sync_xfered; /* Amount of transferred data at the `sync_time` timestamp. It can be off_t sync_xfered; /* Amount of transferred data at the `sync_time` timestamp. It can be
@ -696,7 +699,7 @@ void cb_progress(alpm_progress_t event, const char *pkgname, int percent,
/* callback to handle receipt of total download value */ /* callback to handle receipt of total download value */
void cb_dl_total(size_t howmany, off_t total) void cb_dl_total(size_t howmany, off_t total)
{ {
(void)howmany; list_total_pkgs = howmany;
list_total = total; list_total = total;
} }
@ -744,9 +747,10 @@ static void init_total_progressbar(void)
{ {
totalbar = calloc(1, sizeof(struct pacman_progress_bar)); totalbar = calloc(1, sizeof(struct pacman_progress_bar));
assert(totalbar); assert(totalbar);
totalbar->filename = _("Total:"); totalbar->filename = _("Total");
totalbar->init_time = get_time_ms(); totalbar->init_time = get_time_ms();
totalbar->total_size = list_total; totalbar->total_size = list_total;
totalbar->howmany = list_total_pkgs;
totalbar->rate = 0.0; totalbar->rate = 0.0;
} }
@ -767,7 +771,7 @@ static char *clean_filename(const char *filename)
static void draw_pacman_progress_bar(struct pacman_progress_bar *bar) static void draw_pacman_progress_bar(struct pacman_progress_bar *bar)
{ {
int infolen; int infolen, len;
int filenamelen; int filenamelen;
char *fname; char *fname;
/* used for wide character width determination and printing */ /* used for wide character width determination and printing */
@ -777,7 +781,6 @@ static void draw_pacman_progress_bar(struct pacman_progress_bar *bar)
double rate_human, xfered_human; double rate_human, xfered_human;
const char *rate_label, *xfered_label; const char *rate_label, *xfered_label;
int file_percent = 0; int file_percent = 0;
int len = strlen(bar->filename);
const unsigned short cols = getcols(); const unsigned short cols = getcols();
@ -795,7 +798,17 @@ static void draw_pacman_progress_bar(struct pacman_progress_bar *bar)
fname = clean_filename(bar->filename); fname = clean_filename(bar->filename);
if(bar->howmany > 0) {
short digits = number_length(bar->howmany);
// fname + digits + ( /) + \0
size_t needed = strlen(fname) + (digits * 2) + 4 + 1;
char *name = malloc(needed);
sprintf(name, "%s (%*zu/%*zu)", fname, digits, bar->downloaded, digits, bar->howmany);
free(fname);
fname = name;
}
len = strlen(fname);
infolen = cols * 6 / 10; infolen = cols * 6 / 10;
if(infolen < 50) { if(infolen < 50) {
infolen = 50; infolen = 50;
@ -995,6 +1008,10 @@ static void dload_complete_event(const char *filename, alpm_download_event_compl
return; return;
} }
if(total_enabled) {
totalbar->downloaded++;
}
ok = find_bar_for_filename(filename, &index, &bar); ok = find_bar_for_filename(filename, &index, &bar);
assert(ok); assert(ok);
bar->completed = true; bar->completed = true;