From 54e5723f01cc914a4caba8d46f30ba60f94b8e27 Mon Sep 17 00:00:00 2001
From: Marcus Holland-Moritz <github@mhxnet.de>
Date: Mon, 4 Sep 2023 18:48:34 +0200
Subject: [PATCH] Move progress contexts to bottom of output

---
 src/dwarfs/console_writer.cpp | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/src/dwarfs/console_writer.cpp b/src/dwarfs/console_writer.cpp
index d9b0dff2..e3355253 100644
--- a/src/dwarfs/console_writer.cpp
+++ b/src/dwarfs/console_writer.cpp
@@ -240,20 +240,6 @@ void console_writer::update(progress& p, bool last) {
             << newline;
       }
 
-      if (fancy) {
-        auto w = width.get();
-
-        if (w >= 60) {
-          ctxs = p.get_active_contexts();
-        }
-
-        for (auto const& c : ctxs) {
-          output_context_line(oss, *c, w, pg_mode_ == UNICODE,
-                              log_is_colored());
-          oss << newline;
-        }
-      }
-
       oss << p.dirs_scanned << " dirs, " << p.symlinks_scanned << "/"
           << p.hardlinks << " soft/hard links, " << p.files_scanned << "/"
           << p.files_found << " files, " << p.specials_found << " other"
@@ -340,12 +326,23 @@ void console_writer::update(progress& p, bool last) {
       log_stream() << oss.str();
     }
   } else {
-    oss << progress_bar(width.get() - 6, frac_, pg_mode_ == UNICODE)
+    auto w = width.get();
+
+    oss << progress_bar(w - 6, frac_, pg_mode_ == UNICODE)
         << fmt::format("{:3.0f}% ", 100 * frac_) << "-\\|/"[counter_ % 4]
         << '\n';
 
     ++counter_;
 
+    if (w >= 60) {
+      ctxs = p.get_active_contexts();
+    }
+
+    for (auto const& c : ctxs) {
+      output_context_line(oss, *c, w, pg_mode_ == UNICODE, log_is_colored());
+      oss << newline;
+    }
+
     std::lock_guard lock(log_mutex());
 
     rewind(8 + ctxs.size());