yshui/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Merge "libmain/progress-bar: erase all lines of the multi-line format" into main

Browse source
This commit is contained in:
alois31 2024-09-08 13:42:17 +00:00 committed by Gerrit Code Review
parent f2a49032a6 4715d557ef
commit e9505dcc5a
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/libmain/progress-bar.cc
View file

@ -92,7 +92,7 @@ void ProgressBar::resume()
nextWakeup = draw(*state, {}); nextWakeup = draw(*state, {});
state.wait_for(quitCV, std::chrono::milliseconds(50)); state.wait_for(quitCV, std::chrono::milliseconds(50));
} }
writeLogsToStderr("\r\e[K"); eraseProgressDisplay(*state);
}); });
} }
@ -558,7 +558,8 @@ std::optional<char> ProgressBar::ask(std::string_view msg)
{ {
auto state(state_.lock()); auto state(state_.lock());
if (state->paused > 0 || !isatty(STDIN_FILENO)) return {}; if (state->paused > 0 || !isatty(STDIN_FILENO)) return {};
std::cerr << fmt("\r\e[K%s ", msg); eraseProgressDisplay(*state);
std::cerr << msg;
auto s = trim(readLine(STDIN_FILENO)); auto s = trim(readLine(STDIN_FILENO));
if (s.size() != 1) return {}; if (s.size() != 1) return {};
draw(*state, {}); draw(*state, {});