From 047d9643b54aa857dfff81ba8aed7881a97938a4 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Sun, 8 Sep 2024 01:09:51 +0200
Subject: [PATCH] refact: Extract ProgressBar::redraw(newOutput)

---
 src/libmain/progress-bar.cc | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/libmain/progress-bar.cc b/src/libmain/progress-bar.cc
index d864d9473..2ea743034 100644
--- a/src/libmain/progress-bar.cc
+++ b/src/libmain/progress-bar.cc
@@ -362,23 +362,28 @@ public:
         updateCV.notify_one();
     }
 
+    /**
+     * Redraw, if the output has changed.
+     *
+     * Excessive redrawing is noticable on slow terminals, and it interferes
+     * with text selection in some terminals, including libvte-based terminal
+     * emulators.
+     */
+    void redraw(std::string newOutput)
+    {
+        auto state(state_.lock());
+        if (newOutput != state->lastOutput) {
+            writeToStderr(newOutput);
+            state->lastOutput = std::move(newOutput);
+        }
+    }
+
     std::chrono::milliseconds draw(State & state)
     {
-        // Call draw() and render if the output has changed.
-
-        // Excessive redrawing is noticable on slow terminals, and it interferes
-        // with text selection in some terminals, including libvte-based terminal
-        // emulators.
-
         std::optional<std::string> newOutput;
         auto nextWakeup = draw(state, newOutput);
-        {
-            auto state(state_.lock());
-            if (newOutput && *newOutput != state->lastOutput) {
-                writeToStderr(*newOutput);
-                state->lastOutput = std::move(*newOutput);
-            }
-        }
+        if (newOutput)
+            redraw(*newOutput);
         return nextWakeup;
     }