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

fetch_cb: simplify and improve output.

Browse Source
This commit is contained in:
Juan RP 2012-05-06 10:05:35 +02:00
parent bbd0d893d0
commit 391bb3daf2
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bin/xbps-bin/fetch_cb.c
View File

@ -145,10 +145,9 @@ stat_display(const struct xbps_fetch_cb_data *xfpd, void *cbdata)
(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); (void)xbps_humanize_number(recvsize, (int64_t)xfpd->file_dloaded);
fprintf(stderr,"\r%s: %s [%d%% of %s]", xfpd->file_name, recvsize, fprintf(stderr, "%s: %s [%d%% of %s] %s ETA: %s\033[K\r",
percentage, totsize); xfpd->file_name, recvsize, percentage, totsize,
fprintf(stderr," %s", stat_bps(xfpd, xfer)); stat_bps(xfpd, xfer), stat_eta(xfpd, xfer));
fprintf(stderr," ETA: %s", stat_eta(xfpd, xfer));
} }
void void
@ -167,7 +166,7 @@ fetch_file_progress_cb(const struct xbps_fetch_cb_data *xfpd, void *cbdata)
} 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,"\rDownloaded %s for %s [avg rate: %s]\r\n", fprintf(stderr,"Downloaded %s for %s [avg rate: %s]\n",
size, xfpd->file_name, stat_bps(xfpd, xfer)); size, xfpd->file_name, stat_bps(xfpd, xfer));
} }
} }