zhangyiss/indicators
1
0
Fork 0
mirror of https://github.com/p-ranav/indicators.git synced 2025-12-15 03:38:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Showing [00:00<00:00] if start time is not saved yet #45

Browse Source
This commit is contained in:
Pranav Srinivas Kumar
2020-04-15 10:18:28 -05:00
parent dd08556b27
commit 4aef1470f1
2 changed files with 32 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
include/indicators/block_progress_bar.hpp
View File

@@ -208,9 +208,14 @@ private:
std::cout << " " << std::min(static_cast<size_t>(progress_), size_t(100)) << "%"; std::cout << " " << std::min(static_cast<size_t>(progress_), size_t(100)) << "%";
} }
auto &saved_start_time = get_value<details::ProgressBarOption::saved_start_time>();
if (get_value<details::ProgressBarOption::show_elapsed_time>()) { if (get_value<details::ProgressBarOption::show_elapsed_time>()) {
std::cout << " ["; std::cout << " [";
details::write_duration(std::cout, elapsed); if (saved_start_time)
details::write_duration(std::cout, elapsed);
else
std::cout << "00:00s";
} }
if (get_value<details::ProgressBarOption::show_remaining_time>()) { if (get_value<details::ProgressBarOption::show_remaining_time>()) {
@@ -218,10 +223,16 @@ private:
std::cout << "<"; std::cout << "<";
else else
std::cout << " ["; std::cout << " [";
auto eta = std::chrono::nanoseconds(
progress_ > 0 ? static_cast<long long>(elapsed.count() * 100 / progress_) : 0); if (saved_start_time) {
auto remaining = eta > elapsed ? (eta - elapsed) : (elapsed - eta); auto eta = std::chrono::nanoseconds(
details::write_duration(std::cout, remaining); progress_ > 0 ? static_cast<long long>(elapsed.count() * 100 / progress_) : 0);
auto remaining = eta > elapsed ? (eta - elapsed) : (elapsed - eta);
details::write_duration(std::cout, remaining);
} else {
std::cout << "00:00s";
}
std::cout << "]"; std::cout << "]";
} else { } else {
if (get_value<details::ProgressBarOption::show_elapsed_time>()) if (get_value<details::ProgressBarOption::show_elapsed_time>())

21
include/indicators/progress_bar.hpp
View File

@@ -226,9 +226,14 @@ private:
std::cout << " " << std::min(progress_, size_t(100)) << "%"; std::cout << " " << std::min(progress_, size_t(100)) << "%";
} }
auto &saved_start_time = get_value<details::ProgressBarOption::saved_start_time>();
if (get_value<details::ProgressBarOption::show_elapsed_time>()) { if (get_value<details::ProgressBarOption::show_elapsed_time>()) {
std::cout << " ["; std::cout << " [";
details::write_duration(std::cout, elapsed_); if (saved_start_time)
details::write_duration(std::cout, elapsed_);
else
std::cout << "00:00s";
} }
if (get_value<details::ProgressBarOption::show_remaining_time>()) { if (get_value<details::ProgressBarOption::show_remaining_time>()) {
@@ -236,10 +241,16 @@ private:
std::cout << "<"; std::cout << "<";
else else
std::cout << " ["; std::cout << " [";
auto eta = std::chrono::nanoseconds(
progress_ > 0 ? static_cast<long long>(elapsed_.count() * 100 / progress_) : 0); if (saved_start_time) {
auto remaining = eta > elapsed_ ? (eta - elapsed_) : (elapsed_ - eta); auto eta = std::chrono::nanoseconds(
details::write_duration(std::cout, remaining); progress_ > 0 ? static_cast<long long>(elapsed_.count() * 100 / progress_) : 0);
auto remaining = eta > elapsed_ ? (eta - elapsed_) : (elapsed_ - eta);
details::write_duration(std::cout, remaining);
} else {
std::cout << "00:00s";
}
std::cout << "]"; std::cout << "]";
} else { } else {
if (get_value<details::ProgressBarOption::show_elapsed_time>()) if (get_value<details::ProgressBarOption::show_elapsed_time>())