max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-22 22:16:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

When truncating the progress bar, take ANSI escape sequences into account

Browse source
This commit is contained in:
Eelco Dolstra 2017-08-25 15:44:36 +02:00
parent a3015db6c3
commit ec9e0c03c3
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
1 changed files with 41 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
src/nix/progress-bar.cc
View file

@ -24,6 +24,44 @@ static uint64_t getI(const std::vector<Logger::Field> & fields, size_t n)
return fields[n].i;
}
/* Truncate a string to 'width' printable characters. ANSI escape
sequences are copied but not included in the character count. Also,
tabs are expanded to spaces. */
static std::string ansiTruncate(const std::string & s, int width)
{
if (width <= 0) return s;
std::string t;
size_t w = 0;
auto i = s.begin();
while (w < (size_t) width && i != s.end()) {
if (*i == '\e') {
t += *i++;
if (i != s.end() && *i == '[') {
t += *i++;
while (i != s.end() && (*i < 0x40 || *i > 0x7e)) {
t += *i++;
}
if (i != s.end()) t += *i++;
}
}
else if (*i == '\t') {
t += ' '; w++;
while (w < (size_t) width && w & 8) {
t += ' '; w++;
}
}
else {
t += *i++; w++;
}
}
return t;
}
class ProgressBar : public Logger
{
private:
@ -89,7 +127,7 @@ public:
void log(State & state, Verbosity lvl, const std::string & s)
{
writeToStderr("\r\e[K" + s + "\n");
writeToStderr("\r\e[K" + s + ANSI_NORMAL "\n");
update(state);
}
@ -207,7 +245,7 @@ public:
void update(State & state)
{
std::string line = "\r";
std::string line;
std::string status = getStatus(state);
if (!status.empty()) {
@ -232,8 +270,7 @@ public:
}
}
line += "\e[K";
writeToStderr(std::string(line, 0, width - 1));
writeToStderr("\r" + ansiTruncate(line, width) + "\e[K");
}
std::string getStatus(State & state)