zhangyiss/indicators
1
0
Fork 0
mirror of https://github.com/p-ranav/indicators.git synced 2025-12-16 04:18:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Make DynamicProgress take ownership over progress bars

Browse Source
This commit is contained in:
Michał Walenciak
2024-07-29 17:35:52 +02:00
parent 222382c3a6
commit cb8f728c68
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
include/indicators/dynamic_progress.hpp
View File

@@ -19,10 +19,10 @@ template <typename Indicator> class DynamicProgress {
using Settings = std::tuple<option::HideBarWhenComplete>; using Settings = std::tuple<option::HideBarWhenComplete>;
public: public:
template <typename... Indicators> explicit DynamicProgress(Indicators &... bars) { template <typename... Indicators> explicit DynamicProgress(Indicators &&... bars) {
bars_ = {bars...}; (bars_.emplace_back(std::move(bars)), ...);
for (auto &bar : bars_) { for (auto &bar : bars_) {
bar.get().multi_progress_mode_ = true; bar->multi_progress_mode_ = true;
++total_count_; ++total_count_;
++incomplete_count_; ++incomplete_count_;
} }
@@ -31,13 +31,13 @@ public:
Indicator &operator[](size_t index) { Indicator &operator[](size_t index) {
print_progress(); print_progress();
std::lock_guard<std::mutex> lock{mutex_}; std::lock_guard<std::mutex> lock{mutex_};
return bars_[index].get(); return *bars_[index];
} }
size_t push_back(Indicator &bar) { size_t push_back(std::unique_ptr<Indicator> bar) {
std::lock_guard<std::mutex> lock{mutex_}; std::lock_guard<std::mutex> lock{mutex_};
bar.multi_progress_mode_ = true; bar->multi_progress_mode_ = true;
bars_.push_back(bar); bars_.push_back(std::move(bar));
return bars_.size() - 1; return bars_.size() - 1;
} }
@@ -63,7 +63,7 @@ private:
Settings settings_; Settings settings_;
std::atomic<bool> started_{false}; std::atomic<bool> started_{false};
std::mutex mutex_; std::mutex mutex_;
std::vector<std::reference_wrapper<Indicator>> bars_; std::vector<std::unique_ptr<Indicator>> bars_;
std::atomic<size_t> total_count_{0}; std::atomic<size_t> total_count_{0};
std::atomic<size_t> incomplete_count_{0}; std::atomic<size_t> incomplete_count_{0};
@@ -93,8 +93,8 @@ public:
} }
incomplete_count_ = 0; incomplete_count_ = 0;
for (auto &bar : bars_) { for (auto &bar : bars_) {
if (!bar.get().is_completed()) { if (!bar->is_completed()) {
bar.get().print_progress(true); bar->print_progress(true);
std::cout << "\n"; std::cout << "\n";
++incomplete_count_; ++incomplete_count_;
} }
@@ -106,7 +106,7 @@ public:
if (started_) if (started_)
move_up(static_cast<int>(total_count_)); move_up(static_cast<int>(total_count_));
for (auto &bar : bars_) { for (auto &bar : bars_) {
bar.get().print_progress(true); bar->print_progress(true);
std::cout << "\n"; std::cout << "\n";
} }
if (!started_) if (!started_)
@@ -119,4 +119,4 @@ public:
} // namespace indicators } // namespace indicators
#endif #endif