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

Merge branch 'maint'

Browse source 
Conflicts:
	src/pacman/callback.c
This commit is contained in:
Dan McGee 2011-08-09 16:24:55 -05:00
commit 82d45d66ca
1 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/pacman/callback.c
View file

@ -27,6 +27,7 @@
#include <sys/types.h> /* off_t */ #include <sys/types.h> /* off_t */
#include <unistd.h> #include <unistd.h>
#include <wchar.h> #include <wchar.h>
#include <limits.h> /* UINT_MAX */
#include <alpm.h> #include <alpm.h>
@ -568,10 +569,13 @@ void cb_dl_progress(const char *filename, off_t file_xfered, off_t file_total)
diff_sec = current_time.tv_sec - initial_time.tv_sec; diff_sec = current_time.tv_sec - initial_time.tv_sec;
diff_usec = current_time.tv_usec - initial_time.tv_usec; diff_usec = current_time.tv_usec - initial_time.tv_usec;
timediff = diff_sec + (diff_usec / 1000000.0); timediff = diff_sec + (diff_usec / 1000000.0);
rate = xfered / timediff; if(timediff > 0.0) {
rate = xfered / timediff;
/* round elapsed time to the nearest second */ /* round elapsed time to the nearest second */
eta_s = (int)(timediff + 0.5); eta_s = (unsigned int)(timediff + 0.5);
} else {
eta_s = 0;
}
} else { } else {
/* compute current average values */ /* compute current average values */
timediff = get_update_timediff(0); timediff = get_update_timediff(0);
@ -583,12 +587,20 @@ void cb_dl_progress(const char *filename, off_t file_xfered, off_t file_total)
rate = (xfered - xfered_last) / timediff; rate = (xfered - xfered_last) / timediff;
/* average rate to reduce jumpiness */ /* average rate to reduce jumpiness */
rate = (rate + 2 * rate_last) / 3; rate = (rate + 2 * rate_last) / 3;
eta_s = (total - xfered) / rate; if(rate > 0.0) {
eta_s = (total - xfered) / rate;
} else {
eta_s = UINT_MAX;
}
rate_last = rate; rate_last = rate;
xfered_last = xfered; xfered_last = xfered;
} }
file_percent = (file_xfered * 100) / file_total; if(file_total) {
file_percent = (file_xfered * 100) / file_total;
} else {
file_percent = 100;
}
if(totaldownload) { if(totaldownload) {
total_percent = ((list_xfered + file_xfered) * 100) / total_percent = ((list_xfered + file_xfered) * 100) /
@ -648,6 +660,7 @@ void cb_dl_progress(const char *filename, off_t file_xfered, off_t file_total)
xfered_human = humanize_size(xfered, '\0', 0, &xfered_label); xfered_human = humanize_size(xfered, '\0', 0, &xfered_label);
/* 1 space + filenamelen + 1 space + 7 for size + 1 + 7 for rate + 2 for /s + 1 space + 8 for eta */ /* 1 space + filenamelen + 1 space + 7 for size + 1 + 7 for rate + 2 for /s + 1 space + 8 for eta */
/* TODO: if eta_h > 99, formatting gets all messed up */
printf(" %ls%-*s %6.1f%s %#6.1f%s/s %02u:%02u:%02u", wcfname, printf(" %ls%-*s %6.1f%s %#6.1f%s/s %02u:%02u:%02u", wcfname,
padwid, "", xfered_human, xfered_label, rate_human, rate_label, padwid, "", xfered_human, xfered_label, rate_human, rate_label,
eta_h, eta_m, eta_s); eta_h, eta_m, eta_s);