emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xbps-install/fetch_cb.c: some printf tweaks.

Browse Source
This commit is contained in:
Juan RP 2012-11-07 10:09:50 +01:00
parent fcb565cfa1
commit 89d892d98f
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bin/xbps-install/fetch_cb.c
View File

@ -128,7 +128,7 @@ stat_display(struct xbps_fetch_cb_data *xfpd, void *cbdata)
{ {
struct xferstat *xfer = cbdata; struct xferstat *xfer = cbdata;
struct timeval now; struct timeval now;
char totsize[8], recvsize[8]; char totsize[8];
int percentage; int percentage;
get_time(&now); get_time(&now);
@ -144,9 +144,8 @@ stat_display(struct xbps_fetch_cb_data *xfpd, void *cbdata)
(double)xfpd->file_dloaded) / (double)xfpd->file_size); (double)xfpd->file_dloaded) / (double)xfpd->file_size);
(void)xbps_humanize_number(totsize, (int64_t)xfpd->file_size); (void)xbps_humanize_number(totsize, (int64_t)xfpd->file_size);
} }
(void)xbps_humanize_number(recvsize, (int64_t)xfpd->file_dloaded); fprintf(stderr, "%s: [%s %d%%] %s ETA: %s\033[K\r",
fprintf(stderr, "%s: %s [%d%% of %s] %s ETA: %s\033[K\r", xfpd->file_name, totsize, percentage,
xfpd->file_name, recvsize, percentage, totsize,
stat_bps(xfpd, xfer), stat_eta(xfpd, xfer)); stat_bps(xfpd, xfer), stat_eta(xfpd, xfer));
} }
@ -170,7 +169,7 @@ fetch_file_progress_cb(struct xbps_handle *xhp,
} else if (xfpd->cb_end) { } else if (xfpd->cb_end) {
/* end transfer stats */ /* end transfer stats */
(void)xbps_humanize_number(size, (int64_t)xfpd->file_dloaded); (void)xbps_humanize_number(size, (int64_t)xfpd->file_dloaded);
fprintf(stderr,"Downloaded %s for %s [avg rate: %s]\033[K\n", fprintf(stderr,"%s: %s [avg rate: %s]\033[K\n",
size, xfpd->file_name, stat_bps(xfpd, xfer)); xfpd->file_name, size, stat_bps(xfpd, xfer));
} }
} }