Improve ETA display and align progress percentage in progress bar

Author: ZenanH

src/progressbar.jl

@@ -55,33 +55,35 @@ end
 function calculate_eta_text(current::Int, max::Int, start_time::Float64, is_complete::Bool, show_eta::Bool)::Tuple{String, String}
     # Early return if ETA is disabled or no progress yet
     if !show_eta || current == 0 || start_time == 0
-        return @sprintf("%d%%", round(Int, calculate_percentage(current, max))), ""
+        return @sprintf("%4d%%", round(Int, calculate_percentage(current, max))), ""
     end
 
     elapsed = time() - start_time
 
     if is_complete
-        # Completed: only show total time, no progress percentage
-        return "", " Time: $(format_time(elapsed))"
+        # Completed: show 100% and total time
+        return " 100%", " Time: $(format_time(elapsed))"
     elseif elapsed > 0
-        # In progress: show progress percentage and ETA
-        perc_text = @sprintf("%d%%", round(Int, calculate_percentage(current, max)))
+        # In progress: show progress percentage and ETA (right-aligned to match "100%")
+        perc_text = @sprintf("%4d%%", round(Int, calculate_percentage(current, max)))
         rate = current / elapsed
         remaining = max - current
         eta_seconds = remaining / rate
         return perc_text, " ETA: $(format_time(eta_seconds))"
     else
         # Edge case: no time elapsed yet
-        return @sprintf("%d%%", round(Int, calculate_percentage(current, max))), ""
+        return @sprintf("%4d%%", round(Int, calculate_percentage(current, max))), ""
     end
 end
 
 # Render the progress bar string
 function render_progress_bar(io::IO, p::MiniProgressBar, perc::Float64, 
                              progress_text::String, eta_text::String, termwidth::Int)::Nothing
     # Calculate available width for progress bar
+    # Use fixed width for progress text (4 chars for "100%" + 2 spaces = 6 total)
+    progress_width = isempty(progress_text) ? 0 : 6
     max_progress_width = max(0, min(termwidth - textwidth(p.header) - 
-                             textwidth(progress_text) - textwidth(eta_text) - PROGRESS_BAR_PADDING, p.width))
+                             progress_width - textwidth(eta_text) - PROGRESS_BAR_PADDING, p.width))
 
     # Calculate filled and empty portions
     filled_width = max_progress_width * perc / 100
@@ -94,7 +96,13 @@ function render_progress_bar(io::IO, p::MiniProgressBar, perc::Float64,
     print(io, ANSI_CLEAR_LINE)
     printstyled(io, "[ Info:"; color = :cyan, bold = true)
     print(io, " ")
-    print(io, p.header, " ")
+    print(io, p.header)
+    
+    # Print progress text before the bar (right-aligned percentage with 1 space before and after)
+    if !isempty(progress_text)
+        # Print 1 space, then right-align the percentage in 4 characters
+        print(io, " ", lpad(strip(progress_text), 4), " ")
+    end
 
     # Draw filled portion
     printstyled(io, "━"^n_filled; color = p.color)
@@ -110,9 +118,7 @@ function render_progress_bar(io::IO, p::MiniProgressBar, perc::Float64,
         printstyled(io, empty_char^(n_left - 1 + !hascolor); color = :light_black)
     end
 
-    # Print progress text and ETA
-    printstyled(io, " "; color = :light_black)
-    print(io, progress_text)
+    # Print ETA after the bar
     !isempty(eta_text) && print(io, eta_text)
 
     return nothing

test/test.jl

@@ -1,5 +1,5 @@
 using SimulationLogging
-
+function main()
 prog = MiniProgressBar(
     max = 100,
     header = "processing",
@@ -11,13 +11,22 @@ prog = MiniProgressBar(
 start_progress(stdout, prog)
 
 # Update progress in your loop
-for i in 1:100
-    prog.current = i
+#for i in 1:100
+
+t = 1
+tol = 100
+while t<tol
+    prog.current = t
     show_progress(stdout, prog)
 
     # Your computation here
     sleep(0.05)
+    t += 1
 end
 
 # Finish and show final result
-end_progress(stdout, prog)
+prog.current = 100
+show_progress(stdout, prog)
+end_progress(stdout, prog)
+end
+main()