tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "adb: don't spew push/pull progress to dumb terminals."

Browse source
This commit is contained in:
Treehugger Robot 2018-08-23 02:20:21 +00:00 committed by Gerrit Code Review
commit ddb2bfeae4
2 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
adb/client/line_printer.cpp
View file

@ -67,7 +67,11 @@ static void Out(const std::string& s) {
void LinePrinter::Print(string to_print, LineType type) {
if (!smart_terminal_) {
Out(to_print + "\n");
if (type == LineType::INFO) {
info_line_ = to_print + "\n";
} else {
Out(to_print + "\n");
}
return;
}
@ -123,6 +127,11 @@ void LinePrinter::Print(string to_print, LineType type) {
}
void LinePrinter::KeepInfoLine() {
if (!have_blank_line_) Out("\n");
have_blank_line_ = true;
if (smart_terminal_) {
if (!have_blank_line_) Out("\n");
have_blank_line_ = true;
} else {
Out(info_line_);
info_line_.clear();
}
}

3
adb/client/line_printer.h
View file

@ -42,6 +42,9 @@ struct LinePrinter {
/// Whether the caret is at the beginning of a blank line.
bool have_blank_line_;
/// The last printed info line when printing to a dumb terminal.
std::string info_line_;
#ifdef _WIN32
void* console_;
#endif