progress: sync r/w for terminalWidth

jedib0t · Jan 7, 2024 · 5cf825a · 5cf825a
1 parent 9b00c7e
commit 5cf825a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -30,8 +30,8 @@ jobs:
       # Download all the tools used in the steps that follow
       - name: Set up Tools
         run: |
-          go get -u github.com/fzipp/gocyclo/cmd/gocyclo
-          go get -u github.com/mattn/goveralls
+          go install github.com/fzipp/gocyclo/cmd/gocyclo
+          go install github.com/mattn/goveralls
 
       # Run all the unit-tests
       - name: Test

diff --git a/progress/progress.go b/progress/progress.go
@@ -44,6 +44,7 @@ type Progress struct {
 	sortBy                SortBy
 	style                 *Style
 	terminalWidth         int
+	terminalWidthMutex    sync.RWMutex
 	terminalWidthOverride int
 	trackerPosition       Position
 	trackersActive        []*Tracker
@@ -298,6 +299,9 @@ func (p *Progress) Style() *Style {
 }
 
 func (p *Progress) getTerminalWidth() int {
+	p.terminalWidthMutex.RLock()
+	defer p.terminalWidthMutex.RUnlock()
+
 	if p.terminalWidthOverride > 0 {
 		return p.terminalWidthOverride
 	}
@@ -349,6 +353,9 @@ func (p *Progress) initForRender() {
 }
 
 func (p *Progress) updateTerminalSize() {
+	p.terminalWidthMutex.RLock()
+	defer p.terminalWidthMutex.RUnlock()
+
 	p.terminalWidth, _, _ = term.GetSize(int(os.Stdout.Fd()))
 }