From ab4074edef9481306e910b4e04d1a7625b8065a1 Mon Sep 17 00:00:00 2001 From: Joel Rosdahl Date: Tue, 5 Jul 2022 21:33:26 +0200 Subject: [PATCH] fix: Don't display max size in ccache -s if it's 0 (= unlimited) --- src/core/Statistics.cpp | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/src/core/Statistics.cpp b/src/core/Statistics.cpp index 53dc82679..ab7d5e4bd 100644 --- a/src/core/Statistics.cpp +++ b/src/core/Statistics.cpp @@ -301,23 +301,29 @@ Statistics::format_human_readable(const Config& config, table.add_heading("Primary storage:"); add_ratio_row(table, " Hits:", pri_hits, pri_hits + pri_misses); add_ratio_row(table, " Misses:", pri_misses, pri_hits + pri_misses); + if (!from_log) { - table.add_row({ + std::vector size_cells{ " Cache size (GB):", - C(FMT("{:.2f}", static_cast(pri_size) / g)).right_align(), - "/", - C(FMT("{:.2f}", static_cast(config.max_size()) / g)) - .right_align(), - percent(pri_size, config.max_size()), - }); + C(FMT("{:.2f}", static_cast(pri_size) / g)).right_align()}; + if (config.max_size() != 0) { + size_cells.emplace_back("/"); + size_cells.emplace_back( + C(FMT("{:.2f}", static_cast(config.max_size()) / g)) + .right_align()); + size_cells.emplace_back(percent(pri_size, config.max_size())); + } + table.add_row(size_cells); + if (verbosity > 0) { - std::vector cells{" Files:", S(files_in_cache)}; + std::vector files_cells{" Files:", S(files_in_cache)}; if (config.max_files() > 0) { - cells.emplace_back("/"); - cells.emplace_back(config.max_files()); - cells.emplace_back(percent(S(files_in_cache), config.max_files())); + files_cells.emplace_back("/"); + files_cells.emplace_back(config.max_files()); + files_cells.emplace_back( + percent(S(files_in_cache), config.max_files())); } - table.add_row(cells); + table.add_row(files_cells); } if (cleanups > 0 || verbosity > 1) { table.add_row({" Cleanups:", cleanups}); -- 2.47.3