Differences From Artifact [dd50353974]:
- File utils/ofhttp/ProgressBar.m — part of check-in [b317a4d56d] at 2016-10-08 15:57:47 on branch trunk — OFStdIOStream: Add -[columns] and -[rows] (user: js, size: 5237) [annotate] [blame] [check-ins using]
To Artifact [b2906f802b]:
- File
utils/ofhttp/ProgressBar.m
— part of check-in
[6dff0f5922]
at
2017-01-07 02:34:39
on branch trunk
— Always use "." for the decimal point
This is achieved by replacing the locale's decimal point with "." after
formatting and replacing "." with the locale's decimal point before
parsing.To still use the decimal point from the locale for formatting, the new
flag "," is introduced to formats. This is useful for just printing a
string to the user that is not saved to a file or sent via a network.While this is an ugly hack, there is no better way to do this other than
implementing the functionality of printf and strtod myself, as POSIX
does not specify versions of these that take a locale as an argument.
While this is a lot of work and error-prone, I will most likely end up
doing this eventually.This commit also enables the locale in OFApplication to notice when
things break. As a nice side effect, ofhttp now uses the locale's
decimal point in its user interface. (user: js, size: 5250) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
123 124 125 126 127 128 129 | else [of_stdout writeString: @" "]; for (size_t i = 0; i < barWidth - (size_t)bars - 1; i++) [of_stdout writeString: @" "]; } | | | | | | | | | | | | | | | 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 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 |
else
[of_stdout writeString: @" "];
for (size_t i = 0; i < barWidth - (size_t)bars - 1; i++)
[of_stdout writeString: @" "];
}
[of_stdout writeFormat: @"▏ %,6.2f%% ", percent];
if (percent == 100) {
double timeInterval = -[_startDate timeIntervalSinceNow];
_BPS = (float)_received / (float)timeInterval;
_ETA = timeInterval;
}
if (isinf(_ETA))
[of_stdout writeString: @"--:--:-- "];
else if (_ETA >= 99 * 3600)
[of_stdout writeFormat: @"%,4.2f d ", _ETA / (24 * 3600)];
else
[of_stdout writeFormat: @"%2u:%02u:%02u ",
(uint8_t)(_ETA / 3600), (uint8_t)(_ETA / 60) % 60,
(uint8_t)_ETA % 60];
if (_BPS >= GIBIBYTE)
[of_stdout writeFormat: @"%,7.2f GiB/s", _BPS / GIBIBYTE];
else if (_BPS >= MEBIBYTE)
[of_stdout writeFormat: @"%,7.2f MiB/s", _BPS / MEBIBYTE];
else if (_BPS >= KIBIBYTE)
[of_stdout writeFormat: @"%,7.2f KiB/s", _BPS / KIBIBYTE];
else
[of_stdout writeFormat: @"%,7.2f B/s ", _BPS];
}
- (void)_drawReceived
{
if (_resumedFrom + _received >= GIBIBYTE)
[of_stdout writeFormat:
@"\r %,7.2f GiB ",
(float)(_resumedFrom + _received) / GIBIBYTE];
else if (_resumedFrom + _received >= MEBIBYTE)
[of_stdout writeFormat:
@"\r %,7.2f MiB ",
(float)(_resumedFrom + _received) / MEBIBYTE];
else if (_resumedFrom + _received >= KIBIBYTE)
[of_stdout writeFormat:
@"\r %,7.2f KiB ",
(float)(_resumedFrom + _received) / KIBIBYTE];
else
[of_stdout writeFormat:
@"\r %jd bytes ", _resumedFrom + _received];
if (_stopped)
_BPS = (float)_received /
-(float)[_startDate timeIntervalSinceNow];
if (_BPS >= GIBIBYTE)
[of_stdout writeFormat: @"%,7.2f GiB/s", _BPS / GIBIBYTE];
else if (_BPS >= MEBIBYTE)
[of_stdout writeFormat: @"%,7.2f MiB/s", _BPS / MEBIBYTE];
else if (_BPS >= KIBIBYTE)
[of_stdout writeFormat: @"%,7.2f KiB/s", _BPS / KIBIBYTE];
else
[of_stdout writeFormat: @"%,7.2f B/s ", _BPS];
}
- (void)draw
{
if (_length > 0)
[self _drawProgress];
else
|
| ︙ | ︙ |