1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
|
#include "config.h"
#include <limits.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/stat.h>
#include <unistd.h>
#include <time.h>
#include <sys/time.h>
#include <libintl.h>
#include <math.h>
#include <alpm.h>
#include "util.h"
#include "log.h"
#include "downloadprog.h"
#include "conf.h"
static float rate_last;
static int xfered_last;
static struct timeval initial_time;
extern config_t *config;
#define FILENAME_TRIM_LEN 23
void log_progress(const char *filename, int xfered, int total)
{
const int infolen = 50;
char *fname, *p;
float rate = 0.0, timediff = 0.0, f_xfered = 0.0;
unsigned int eta_h = 0, eta_m = 0, eta_s = 0;
int percent;
char rate_size = 'K', xfered_size = 'K';
if(config->noprogressbar) {
return;
}
XXX
MSG(NL,NULL);
if(xfered == 0) {
gettimeofday(&initial_time, NULL);
xfered_last = 0;
rate_last = 0.0;
timediff = get_update_timediff(1);
rate = 0.0;
eta_s = 0;
set_output_padding(1);
} else if(xfered == total) {
struct timeval current_time;
float diff_sec, diff_usec;
gettimeofday(¤t_time, NULL);
diff_sec = current_time.tv_sec - initial_time.tv_sec;
diff_usec = current_time.tv_usec - initial_time.tv_usec;
timediff = diff_sec + (diff_usec / 1000000.0);
rate = (float)total / (timediff * 1024.0);
eta_s = (int)floorf(timediff + 0.5);
set_output_padding(0);
} else {
timediff = get_update_timediff(0);
if(timediff < UPDATE_SPEED_SEC) {
return;
}
rate = (float)(xfered - xfered_last) / (timediff * 1024.0);
rate = (float)(rate + 2*rate_last) / 3;
eta_s = (unsigned int)(total - xfered) / (rate * 1024.0);
rate_last = rate;
xfered_last = xfered;
}
percent = (int)((float)xfered) / ((float)total) * 100;
eta_h = eta_s / 3600;
eta_s -= eta_h * 3600;
eta_m = eta_s / 60;
eta_s -= eta_m * 60;
fname = strdup(filename);
if((p = strstr(fname, PM_EXT_PKG)) || (p = strstr(fname, PM_EXT_DB))) {
*p = '\0';
}
if(strlen(fname) > FILENAME_TRIM_LEN) {
strcpy(fname + FILENAME_TRIM_LEN -3,"...");
}
if(rate > 2048.0) {
rate /= 1024.0;
rate_size = 'M';
if(rate > 2048.0) {
rate /= 1024.0;
rate_size = 'G';
}
}
f_xfered = (float) xfered / 1024.0;
if(f_xfered > 2048.0) {
f_xfered /= 1024.0;
xfered_size = 'M';
if(f_xfered > 2048.0) {
f_xfered /= 1024.0;
xfered_size = 'G';
}
}
printf(" %-*s %6.1f%c %#6.1f%c/s %02u:%02u:%02u", FILENAME_TRIM_LEN, fname,
f_xfered, xfered_size, rate, rate_size, eta_h, eta_m, eta_s);
free(fname);
fill_progress(percent, getcols() - infolen);
return;
}
|