Differences From Artifact [f001d1016e]:
- File
utils/ofhttp/ProgressBar.m
— part of check-in
[44f45c2e35]
at
2017-01-09 17:36:36
on branch trunk
— Update copyright
Forgot to add 2017, even though I already did quite some changes in
2017. (user: js, size: 6860) [annotate] [blame] [check-ins using]
To Artifact [509373b942]:
- File utils/ofhttp/ProgressBar.m — part of check-in [7ffbd24169] at 2017-02-27 21:57:16 on branch trunk — ofhttp: Move formatting out of localized strings (user: js, size: 6909) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
175 176 177 178 179 180 181 182 183 184 185 |
@"%[num] B/s ",
@"num", num)];
}
}
- (void)_drawReceived
{
if (_resumedFrom + _received >= GIBIBYTE) {
OFString *num = [OFString stringWithFormat:
@"%,7.2f", (float)(_resumedFrom + _received) / GIBIBYTE];
[of_stdout writeString: OF_LOCALIZED(@"progress_gib",
| > > | | | | > > | 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 |
@"%[num] B/s ",
@"num", num)];
}
}
- (void)_drawReceived
{
[of_stdout writeString: @"\r "];
if (_resumedFrom + _received >= GIBIBYTE) {
OFString *num = [OFString stringWithFormat:
@"%,7.2f", (float)(_resumedFrom + _received) / GIBIBYTE];
[of_stdout writeString: OF_LOCALIZED(@"progress_gib",
@"%[num] GiB",
@"num", num)];
} else if (_resumedFrom + _received >= MEBIBYTE) {
OFString *num = [OFString stringWithFormat:
@"%,7.2f", (float)(_resumedFrom + _received) / MEBIBYTE];
[of_stdout writeString: OF_LOCALIZED(@"progress_mib",
@"%[num] MiB",
@"num", num)];
} else if (_resumedFrom + _received >= KIBIBYTE) {
OFString *num = [OFString stringWithFormat:
@"%,7.2f", (float)(_resumedFrom + _received) / KIBIBYTE];
[of_stdout writeString: OF_LOCALIZED(@"progress_kib",
@"%[num] KiB",
@"num", num)];
} else {
OFString *num = [OFString stringWithFormat:
@"%jd", _resumedFrom + _received];
[of_stdout writeString: OF_LOCALIZED(@"progress_bytes",
@"%[num] bytes",
@"num", num)];
}
[of_stdout writeString: @" "];
if (_stopped)
_BPS = (float)_received /
-(float)[_startDate timeIntervalSinceNow];
if (_BPS >= GIBIBYTE) {
OFString *num = [OFString stringWithFormat:
|
| ︙ | ︙ |