From 465dc62a6d9d6c9c43f1ce0989bb4a614377bc01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Artur=20Sza=C5=82ata?= <arturs6668@gmail.com>
Date: Tue, 28 Sep 2021 21:21:38 +0200
Subject: [PATCH] add the indication of the remaining time

---
 progress_bar.cpp | 54 ++++++++++++++++++++++++++++++++++++++++++++++--
 progress_bar.hpp |  3 +++
 2 files changed, 55 insertions(+), 2 deletions(-)

diff --git a/progress_bar.cpp b/progress_bar.cpp
index 86a5498..84fd93a 100644
--- a/progress_bar.cpp
+++ b/progress_bar.cpp
@@ -146,7 +146,8 @@ void ProgressBar::ShowProgress(uint64_t progress) const {
         os << std::put_time(std::localtime(&time), "[%F %T.")
            << std::setfill('0') << std::setw(3) << ms.count() << "]\t"
            << get_progress_summary(progress_ratio)
-           << ", " + std::to_string(progress) + "/" + std::to_string(total_) + '\n';
+           << ", " + std::to_string(progress) + "/" + std::to_string(total_)
+           << ", " + BeautifyDuration(RemainingExecutionTime(progress_ratio)) + " remaining" + '\n';
         *out << os.str() << std::flush;
         return;
     }
@@ -167,7 +168,8 @@ void ProgressBar::ShowProgress(uint64_t progress) const {
                         + std::string(size_t(bar_size * progress_ratio), unit_bar_)
                         + std::string(bar_size - size_t(bar_size * progress_ratio), unit_space_)
                       + "] " + get_progress_summary(progress_ratio)
-                      + ", " + std::to_string(progress) + "/" + std::to_string(total_) + '\r';
+                      + ", " + std::to_string(progress) + "/" + std::to_string(total_)
+                      + ", " + BeautifyDuration(RemainingExecutionTime(progress_ratio)) + " remaining" + '\r';
 
         *out << buffer_ << std::flush;
 
@@ -183,6 +185,9 @@ ProgressBar& ProgressBar::operator++() {
 }
 
 ProgressBar& ProgressBar::operator+=(uint64_t delta) {
+    if (progress_.load() == 0)
+        start_time_.store(std::chrono::system_clock::now());
+
     if (silent_ || !delta)
         return *this;
 
@@ -202,3 +207,48 @@ ProgressBar& ProgressBar::operator+=(uint64_t delta) {
 
     return *this;
 }
+
+std::chrono::duration<double> ProgressBar::RemainingExecutionTime(double progress_ratio) const {
+    // epsilon to avoid division by zero
+    if (progress_ratio == 0)
+        progress_ratio = 1e-2;
+
+    auto now = std::chrono::system_clock::now();
+    std::chrono::duration<double> diff = now - start_time_.load();
+    double total_s = 1 / progress_ratio * diff.count();
+    return std::chrono::duration<double>(total_s - progress_ratio * total_s);
+}
+
+// from https://stackoverflow.com/questions/22590821/convert-stdduration-to-human-readable-time
+std::string ProgressBar::BeautifyDuration(std::chrono::duration<double> input_seconds) const {
+    using namespace std::chrono;
+    typedef duration<int, std::ratio<86400>> days;
+    auto d = duration_cast<days>(input_seconds);
+    input_seconds -= d;
+    auto h = duration_cast<hours>(input_seconds);
+    input_seconds -= h;
+    auto m = duration_cast<minutes>(input_seconds);
+    input_seconds -= m;
+
+    auto dc = d.count();
+    auto hc = h.count();
+    auto mc = m.count();
+
+    std::stringstream ss;
+    ss.fill('0');
+    if (dc) {
+        ss << d.count() << "d";
+    }
+    if (dc || hc) {
+        if (dc) { ss << std::setw(2); } //pad if second set of numbers
+        ss << h.count() << "h";
+    }
+    if (dc || hc || mc) {
+        if (dc || hc) { ss << std::setw(2); }
+        ss << m.count() << "m";
+    }
+    if (dc || hc || mc) { ss << std::setw(2); }
+    ss << input_seconds.count() << 's';
+
+    return ss.str();
+}
diff --git a/progress_bar.hpp b/progress_bar.hpp
index 9521e5f..221d48f 100644
--- a/progress_bar.hpp
+++ b/progress_bar.hpp
@@ -35,6 +35,8 @@ class ProgressBar {
     void ShowProgress(uint64_t progress) const;
     int GetConsoleWidth() const;
     int GetBarLength() const;
+    std::chrono::duration<double> RemainingExecutionTime(double progress_ratio) const;
+    std::string BeautifyDuration(std::chrono::duration<double> input_seconds) const;
 
     bool silent_;
     bool logging_mode_;
@@ -42,6 +44,7 @@ class ProgressBar {
     std::atomic<uint64_t> progress_ = {0};
     uint64_t frequency_update;
     std::ostream *out;
+    std::atomic<std::chrono::time_point<std::chrono::system_clock>> start_time_;
     mutable std::mutex mu_;
     mutable std::string buffer_;