diff options
| author | Ivy Foster <ivy.foster@gmail.com> | 2016-07-09 05:11:25 +0200 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2016-08-30 10:10:40 +0200 |
| commit | 58140dba7440997e9d318fb56ed939a9c81fddf8 (patch) | |
| tree | 5e2633a6c63cf56711e381602f6fae2dfdc775d9 /lib | |
| parent | 56de155296a57fb3fcd8ae64aed00fd18fe2f22e (diff) | |
| download | pacman-58140dba7440997e9d318fb56ed939a9c81fddf8.tar.gz pacman-58140dba7440997e9d318fb56ed939a9c81fddf8.tar.xz | |
Normalize alpm download callback's frontend cb arguments
When curl calls alpm's dlcb, alpm calls the frontend's cb with the
following (dlsize, totalsize) arguments:
0, -1: initialize
0, 0: no change since last call
x {x>0, x<y}, y {y>0}: data downloaded, total size known
x {x>0}, x: download finished
If total size is not known, do not call frontend cb (no change to
original behavior); alpm's callback shouldn't be called if there is a
download error.
See agregory's original spec here:
https://wiki.archlinux.org/index.php/User:Apg#download_callback
Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libalpm/dload.c | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 31ae82c5..f4e6a278 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -126,14 +126,24 @@ static int dload_progress_cb(void *file, double dltotal, double dlnow, } /* initialize the progress bar here to avoid displaying it when - * a repo is up to date and nothing gets downloaded */ - if(payload->prevprogress == 0) { - payload->handle->dlcb(payload->remote_name, 0, (off_t)dltotal); - } - + * a repo is up to date and nothing gets downloaded. + * payload->handle->dlcb will receive the remote_name + * and the following arguments: + * 0, -1: download initialized + * 0, 0: non-download event + * x {x>0}, x: download complete + * x {x>0, x<y}, y {y > 0}: download progress, expected total is known */ + if(current_size == total_size) { + payload->handle->dlcb(payload->remote_name, (off_t)dlnow, (off_t)dltotal); + } else if(!payload->prevprogress) { + payload->handle->dlcb(payload->remote_name, 0, -1); + } else if(payload->prevprogress == current_size) { + payload->handle->dlcb(payload->remote_name, 0, 0); + } else { /* do NOT include initial_size since it wasn't part of the package's * download_size (nor included in the total download size callback) */ - payload->handle->dlcb(payload->remote_name, (off_t)dlnow, (off_t)dltotal); + payload->handle->dlcb(payload->remote_name, (off_t)dlnow, (off_t)dltotal); + } payload->prevprogress = current_size; |