progress: move the "finished" tag to a column where it won't obscure data

The "done" pointer and the "%done" fields are still useful because they
indicate _actual_ progress, not the work that has been _promised_.
So it is possible for a crawl to be "finished" (all extents queued)
but not "100.0000%" (some of those extents still active or in the queue).

"deferred" state isn't particularly useful, so drop it.

"finished" state implies no ETA, so that column is unused.

Signed-off-by: Zygo Blaxell <bees@furryterror.org>

diff --git a/src/bees-roots.cc b/src/bees-roots.cc
index 3895927ac2fae325af5183af20ac09c8189405a6..d913fa11d915293b1f20abbebb8d8abe10a3da7c 100644 (file)
--- a/src/bees-roots.cc
+++ b/src/bees-roots.cc
@@ -1039,9 +1039,10 @@ BeesScanModeExtent::next_transid(const CrawlMap &crawl_map_unused)
                string eta_stamp = "-";
                string eta_pretty = "-";
                const auto &deferred_finished = deferred_map.at(subvol);
-               const bool deferred = deferred_finished.first;
                const bool finished = deferred_finished.second;
-               if (time_so_far > 1 && bytenr_percent > 0 && !finished) {
+               if (finished) {
+                       eta_stamp = "finished";
+               } else if (time_so_far > 1 && bytenr_percent > 0) {
                        const time_t eta_duration = time_so_far / (bytenr_percent / 100);
                        const time_t eta_time = eta_duration + now;
                        struct tm ltm = { 0 };
@@ -1055,8 +1056,8 @@ BeesScanModeExtent::next_transid(const CrawlMap &crawl_map_unused)
                const auto &mma = mes.m_map.at(subvol);
                const auto mma_ratio = mes_sample_size_ok ? (mma.m_bytes / double(mes.m_total)) : 1.0;
                const auto pos_scaled_text = mes_sample_size_ok ? pretty(bytenr_offset * mma_ratio) : "-";
-               const auto pos_text = Table::Text(deferred ? "deferred" : pos_scaled_text);
-               const auto pct_text = Table::Text(finished ? "finished" : astringprintf("%.4f%%", bytenr_percent));
+               const auto pos_text = Table::Text(pos_scaled_text);
+               const auto pct_text = Table::Text(astringprintf("%.4f%%", bytenr_percent));
                const auto size_text = Table::Text( mes_sample_size_ok ? pretty(fs_size * mma_ratio) : "-");
                eta.insert_row(Table::endpos, vector<Table::Content> {
                        pos_text,