moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

Made the progress bar cooler, with ideas from Bjrn Stenberg <bjorn@haxx.nu>

This commit is contained in:
Daniel Stenberg 2000-01-16 18:52:53 +00:00
parent 63aefdb50b
commit 7c8bb5dfff
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/progress.c
View File

@ -83,7 +83,8 @@ void ProgressInit(struct UrlData *data, int max)
if ( data->progressmode == CURL_PROGRESS_STATS ) if ( data->progressmode == CURL_PROGRESS_STATS )
fprintf(data->err, fprintf(data->err,
" %% Received Total Speed Time left Total Curr.Speed\n"); " %% Received Total Speed Estimated Time Left Curr.Speed\n");
} }
void time2str(char *r, int t) void time2str(char *r, int t)
@ -144,18 +145,21 @@ void ProgressShow(struct UrlData *data,
return; return;
if(-1 != progressmax) { if(-1 != progressmax) {
char left[20],estim[20]; char left[20];
char estim[20];
char timespent[20];
int estimate = progressmax/(int) speed; int estimate = progressmax/(int) speed;
time2str(left,estimate-(int) spent); time2str(left,estimate-(int) spent);
time2str(estim,estimate); time2str(estim,estimate);
time2str(timespent,spent);
percen=(double)point/progressmax; percen=(double)point/progressmax;
percen=percen*100; percen=percen*100;
fprintf(data->err, "\r%3d %8d %8d %6.0lf %s %s %6.0lf ", fprintf(stderr, "\r%3d %10d %10d %6.0lf %s %s %s %6.0lf ",
(int)percen, point, progressmax, (int)percen, point, progressmax,
speed, left, estim, data->current_speed); speed, estim, timespent, left, data->current_speed);
} }
else else
fprintf(data->err, fprintf(data->err,