starred/container
1
0
Fork 0
mirror of https://github.com/apple/container.git synced 2026-08-24 02:24:19 -05:00
Code Issues Packages Projects Releases Wiki Activity

Improve readability of progress bar width computation. (#1584)

Browse Source 
- Refines bugfix from #1547, no functional changes.
This commit is contained in:
J Logan
2026-05-22 13:03:09 -07:00
committed by GitHub
parent 985248cf23
commit caff1e9b42
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/TerminalProgress/ProgressBar.swift
+15 -8
View File
@@ -271,18 +271,25 @@ extension ProgressBar {
// Progress bar - always shown if configured
if config.showProgressBar, total > 0, allowProgress {
// reserve spaces between components, plus 45 for components rendered after the bar (size, speed, time, etc.)
let joinedComponents = components.joined(separator: " ")
// 45 reserves space for components rendered after the bar (size, speed, time, etc.)
let usedWidth = (useColor ? joinedComponents.visibleLength : joinedComponents.count) + 45
let remainingWidth = max(config.width - usedWidth, 1)
let barLength = min(remainingWidth, max(0, state.finished ? remainingWidth : Int(Int64(remainingWidth) * value / total)))
let barPaddingLength = remainingWidth - barLength
let reservedWidth = (useColor ? joinedComponents.visibleLength : joinedComponents.count) + 45
let totalBarWidth = max(config.width - reservedWidth, 1)
let completedWidth: Int
if state.finished {
completedWidth = totalBarWidth
} else {
let progressWidth = max(0, Int(Int64(totalBarWidth) * value / total))
completedWidth = min(totalBarWidth, progressWidth)
}
let uncompletedWidth = totalBarWidth - completedWidth
if useColor {
let filledBar = EscapeSequence.colored(String(repeating: config.theme.bar, count: barLength), EscapeSequence.green)
let emptyBar = String(repeating: " ", count: barPaddingLength)
let filledBar = EscapeSequence.colored(String(repeating: config.theme.bar, count: completedWidth), EscapeSequence.green)
let emptyBar = String(repeating: " ", count: uncompletedWidth)
components.append("|\(filledBar)\(emptyBar)|")
} else {
let bar = "\(String(repeating: config.theme.bar, count: barLength))\(String(repeating: " ", count: barPaddingLength))"
let bar = "\(String(repeating: config.theme.bar, count: completedWidth))\(String(repeating: " ", count: uncompletedWidth))"
components.append("|\(bar)|")
}
}