From cbe6872518bd67f05f87172367b22ad763241b21 Mon Sep 17 00:00:00 2001
From: r00ster91 <r00ster91@proton.me>
Date: Thu, 13 Oct 2022 14:46:25 +0200
Subject: [PATCH] refactor: max_width calculation

I think this may be helpful in the future when we might want to calculate this again at some other point.
It also makes it more clear that the other two functions below it are only required for this calculation.
---
 lib/std/Progress.zig | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/lib/std/Progress.zig b/lib/std/Progress.zig
index 5809333ca687361484112b588c092573587bcbd2..61451f8e1c0e277d191b0f177d68caa631f8c299 100644
--- a/lib/std/Progress.zig
+++ b/lib/std/Progress.zig
@@ -178,6 +178,22 @@ pub fn start(self: *Progress, name: []const u8, estimated_total_items: usize) *N
         // we are in a "dumb" terminal like in acme or writing to a file
         self.terminal = stderr;
     }
+    self.calculateMaxWidth();
+    self.root = Node{
+        .context = self,
+        .parent = null,
+        .name = name,
+        .unprotected_estimated_total_items = estimated_total_items,
+        .unprotected_completed_items = 0,
+    };
+    self.columns_written = 0;
+    self.prev_refresh_timestamp = 0;
+    self.timer = time.Timer.start() catch null;
+    self.done = false;
+    return &self.root;
+}
+
+fn calculateMaxWidth(self: *Progress) void {
     if (self.max_width == null) {
         if (self.terminal) |terminal| {
             // choose an optimal width and account for progress output that could have been printed
@@ -194,18 +210,6 @@ pub fn start(self: *Progress, name: []const u8, estimated_total_items: usize) *N
         truncation_suffix.len, // make sure we can at least truncate
         self.output_buffer.len - 1,
     );
-    self.root = Node{
-        .context = self,
-        .parent = null,
-        .name = name,
-        .unprotected_estimated_total_items = estimated_total_items,
-        .unprotected_completed_items = 0,
-    };
-    self.columns_written = 0;
-    self.prev_refresh_timestamp = 0;
-    self.timer = time.Timer.start() catch null;
-    self.done = false;
-    return &self.root;
 }
 
 fn getTerminalWidth(self: Progress, file_handle: os.fd_t) !u16 {
-- 
2.54.0