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

xbps_fetch_file: set bytes downloaded correctly for the fetch client cb.

Browse Source
This commit is contained in:
Juan RP 2011-12-01 12:21:13 +01:00
parent e7562fa72d
commit 8be527cbdf
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -57,7 +57,7 @@ stat_eta(const struct xbps_fetch_cb_data *xfpd, void *cbdata)
elapsed = xfer->last.tv_sec - xfer->start.tv_sec; elapsed = xfer->last.tv_sec - xfer->start.tv_sec;
received = xfpd->file_dloaded - xfpd->file_offset; received = xfpd->file_dloaded - xfpd->file_offset;
expected = xfpd->file_size - xfpd->file_dloaded; expected = xfpd->file_size - xfpd->file_dloaded;
eta = (long)(elapsed * expected / received); eta = (long)(elapsed * (long)expected / (long)received);
if (eta > 3600) if (eta > 3600)
snprintf(str, sizeof str, "%02ldh%02ldm", snprintf(str, sizeof str, "%02ldh%02ldm",
eta / 3600, (eta % 3600) / 60); eta / 3600, (eta % 3600) / 60);
@ -124,10 +124,7 @@ stat_display(const struct xbps_fetch_cb_data *xfpd, void *cbdata)
(int)((double)(100.0 * (int)((double)(100.0 *
(double)xfpd->file_dloaded) / (double)xfpd->file_size), totsize); (double)xfpd->file_dloaded) / (double)xfpd->file_size), totsize);
fprintf(stderr," %s", stat_bps(xfpd, xfer)); fprintf(stderr," %s", stat_bps(xfpd, xfer));
if (xfpd->file_size > 0 && xfpd->file_dloaded > 0 && fprintf(stderr," ETA: %s", stat_eta(xfpd, xfer));
xfer->last.tv_sec >= xfer->start.tv_sec + 10)
fprintf(stderr," ETA: %s", stat_eta(xfpd, xfer));
fprintf(stderr,"\033[K"); fprintf(stderr,"\033[K");
} }

4
lib/download.c
View File

@ -265,7 +265,7 @@ xbps_fetch_file(const char *uri,
* and let the user know that the transfer is going to start * and let the user know that the transfer is going to start
* immediately. * immediately.
*/ */
xbps_set_cb_fetch(url_st.size, url->offset, -1, xbps_set_cb_fetch(url_st.size, url->offset, url->offset,
filename, true, false, false); filename, true, false, false);
/* /*
* Start fetching requested file. * Start fetching requested file.
@ -282,7 +282,7 @@ xbps_fetch_file(const char *uri,
* Let the fetch progress callback know that * Let the fetch progress callback know that
* we are sucking more bytes from it. * we are sucking more bytes from it.
*/ */
xbps_set_cb_fetch(url_st.size, url->offset, bytes_dload, xbps_set_cb_fetch(url_st.size, url->offset, url->offset + bytes_dload,
filename, false, true, false); filename, false, true, false);
} }
if (bytes_read == -1) { if (bytes_read == -1) {