Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 09da8ea1 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

Change-Id: I08ed91e0c888004d8e9aa3ffe71cc01587b16fce
parents bbb333fe 934135d5

adb/client/file_sync_client.cpp

+6 −1
Original line number Original line Diff line number Diff line
@@ -112,6 +112,7 @@ struct TransferLedger { 
    uint64_t bytes_transferred;

    uint64_t bytes_transferred;

    uint64_t bytes_expected;

    uint64_t bytes_expected;

    bool expect_multiple_files;

    bool expect_multiple_files;

    std::string last_progress_str;





    TransferLedger() {

    TransferLedger() {

        Reset();

        Reset();
@@ -127,6 +128,7 @@ struct TransferLedger { 
    }

    }





    void Reset() {

    void Reset() {

        last_progress_str.clear();

        start_time = std::chrono::steady_clock::now();

        start_time = std::chrono::steady_clock::now();

        files_transferred = 0;

        files_transferred = 0;

        files_skipped = 0;

        files_skipped = 0;
@@ -181,7 +183,10 @@ struct TransferLedger { 
                    android::base::StringPrintf("[%4s] %s", overall_percentage_str, file.c_str());

                    android::base::StringPrintf("[%4s] %s", overall_percentage_str, file.c_str());

            }

            }

        }

        }

        if (output != last_progress_str) {

            lp.Print(output, LinePrinter::LineType::INFO);

            lp.Print(output, LinePrinter::LineType::INFO);

            last_progress_str = std::move(output);

        }

    }

    }





    void ReportTransferRate(LinePrinter& lp, const std::string& name, TransferDirection direction) {

    void ReportTransferRate(LinePrinter& lp, const std::string& name, TransferDirection direction) {