Merge "[adb] Print fewer progress messages for push/pull" into rvc-dev am: 934135d576

Change-Id: I3a05ae90ff85a979a1d4efc661e8c8a2f2aa13e7
This commit is contained in:
TreeHugger Robot 2020-03-20 10:13:15 +00:00 committed by Automerger Merge Worker
commit 97046b951c

View file

@ -112,6 +112,7 @@ struct TransferLedger {
uint64_t bytes_transferred;
uint64_t bytes_expected;
bool expect_multiple_files;
std::string last_progress_str;
TransferLedger() {
Reset();
@ -127,6 +128,7 @@ struct TransferLedger {
}
void Reset() {
last_progress_str.clear();
start_time = std::chrono::steady_clock::now();
files_transferred = 0;
files_skipped = 0;
@ -181,7 +183,10 @@ struct TransferLedger {
android::base::StringPrintf("[%4s] %s", overall_percentage_str, file.c_str());
}
}
lp.Print(output, LinePrinter::LineType::INFO);
if (output != last_progress_str) {
lp.Print(output, LinePrinter::LineType::INFO);
last_progress_str = std::move(output);
}
}
void ReportTransferRate(LinePrinter& lp, const std::string& name, TransferDirection direction) {