From 8c4e48d5113bce0da7cc210a2d78436de1ff054a Mon Sep 17 00:00:00 2001 From: Bartek Kryza Date: Thu, 15 Jun 2023 21:41:22 +0200 Subject: [PATCH] Fixed clang-tidy warnings --- src/common/generators/generators.h | 2 +- src/common/generators/progress_indicator.cc | 15 +++++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/common/generators/generators.h b/src/common/generators/generators.h index f6ad1db3..484a699d 100644 --- a/src/common/generators/generators.h +++ b/src/common/generators/generators.h @@ -225,7 +225,7 @@ public: const DiagramConfig &config, std::function progress) : diagram_{diagram} , config_{config} - , progress_{progress} + , progress_{std::move(progress)} { } diff --git a/src/common/generators/progress_indicator.cc b/src/common/generators/progress_indicator.cc index d6dd4379..cfabc9de 100644 --- a/src/common/generators/progress_indicator.cc +++ b/src/common/generators/progress_indicator.cc @@ -32,14 +32,17 @@ void progress_indicator::add_progress_bar( { auto postfix_text = max > 0 ? fmt::format("{}/{}", 0, max) : std::string{}; + const auto kBarWidth = 35U; + const auto kPrefixTextWidth = 25U; + auto bar = std::make_shared( - indicators::option::BarWidth{34}, + indicators::option::BarWidth{kBarWidth}, indicators::option::ForegroundColor{color}, indicators::option::ShowElapsedTime{true}, indicators::option::Fill{"█"}, indicators::option::Lead{"█"}, indicators::option::Remainder{"-"}, indicators::option::PrefixText{ - fmt::format("{:<25}", util::abbreviate(name, 25))}, + fmt::format("{:<25}", util::abbreviate(name, kPrefixTextWidth))}, indicators::option::PostfixText{postfix_text}); progress_bars_mutex_.lock(); @@ -55,6 +58,8 @@ void progress_indicator::add_progress_bar( void progress_indicator::increment(const std::string &name) { + const auto kASTTraverseProgressPercent = 95U; + progress_bars_mutex_.lock(); if (progress_bar_index_.count(name) == 0) { @@ -67,7 +72,7 @@ void progress_indicator::increment(const std::string &name) progress_bars_mutex_.unlock(); p.progress++; - bar.set_progress((p.progress * 95) / p.max); + bar.set_progress((p.progress * kASTTraverseProgressPercent) / p.max); bar.set_option(indicators::option::PostfixText{ fmt::format("{}/{}", p.progress, p.max)}); } @@ -85,6 +90,8 @@ void progress_indicator::stop() void progress_indicator::complete(const std::string &name) { + const auto kCompleteProgressPercent = 100U; + progress_bars_mutex_.lock(); if (progress_bar_index_.count(name) == 0) { @@ -96,7 +103,7 @@ void progress_indicator::complete(const std::string &name) auto &bar = progress_bars_[p.index]; progress_bars_mutex_.unlock(); - bar.set_progress(100); + bar.set_progress(kCompleteProgressPercent); bar.set_option(indicators::option::PostfixText{ fmt::format("{}/{} ✔", p.progress, p.max)});