fix progress bar on tmux control mode

go.mod

@@ -8,7 +8,7 @@ require (
 	github.com/klauspost/compress v1.17.4
 	github.com/ncruces/zenity v0.10.10
 	github.com/stretchr/testify v1.8.4
-	github.com/trzsz/go-arg v1.5.2
+	github.com/trzsz/go-arg v1.5.3
 	github.com/trzsz/promptui v0.10.5
 	golang.org/x/sys v0.15.0
 	golang.org/x/term v0.15.0

go.sum

@@ -32,8 +32,8 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
-github.com/trzsz/go-arg v1.5.2 h1:zGxCuTKvtC3jBf7HbvNk0HooUjv8uKAy2mY+bHVhRas=
-github.com/trzsz/go-arg v1.5.2/go.mod h1:IC6Z/FiVH7uYvcbp1/gJhDYCFPS/GkL0APYakVvgY4I=
+github.com/trzsz/go-arg v1.5.3 h1:eIDwDEmvSahtr5HpQOLrSa+YMqWQQ0H20xx60XgXQJw=
+github.com/trzsz/go-arg v1.5.3/go.mod h1:IC6Z/FiVH7uYvcbp1/gJhDYCFPS/GkL0APYakVvgY4I=
 github.com/trzsz/promptui v0.10.5 h1:tlzJkx+JOeE0sqKWmqgaoToZiYqj5G1Mz+QDV97VFu8=
 github.com/trzsz/promptui v0.10.5/go.mod h1:GMZtu6ZTzU73CBFkzGtmB4wnTROIAbv4GFA74fV8V8g=
 go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A=

trzsz/filter.go

@@ -308,6 +308,22 @@ func (filter *TrzszFilter) chooseUploadPaths(directory bool) ([]string, error) {
 	return files, nil
 }
 
+func (filter *TrzszFilter) createProgressBar(quiet bool, tmuxPaneColumns int32) {
+	if quiet {
+		filter.progress.Store(nil)
+		return
+	}
+	filter.progress.Store(newTextProgressBar(filter.clientOut, filter.options.TerminalColumns,
+		tmuxPaneColumns, filter.trigger.tmuxPrefix))
+}
+
+func (filter *TrzszFilter) resetProgressBar() {
+	if progress := filter.progress.Load(); progress != nil {
+		progress.showCursor()
+	}
+	filter.progress.Store(nil)
+}
+
 func (filter *TrzszFilter) downloadFiles(transfer *trzszTransfer) error {
 	path, err := filter.chooseDownloadPath()
 	if err == errUserCanceled {
@@ -332,12 +348,8 @@ func (filter *TrzszFilter) downloadFiles(transfer *trzszTransfer) error {
 		return err
 	}
 
-	filter.progress.Store(nil)
-	if !config.Quiet {
-		filter.progress.Store(newTextProgressBar(filter.clientOut, filter.options.TerminalColumns,
-			config.TmuxPaneColumns, filter.trigger.tmuxPrefix))
-		defer filter.progress.Store(nil)
-	}
+	filter.createProgressBar(config.Quiet, config.TmuxPaneColumns)
+	defer filter.resetProgressBar()
 
 	localNames, err := transfer.recvFiles(path, filter.progress.Load())
 	if err != nil {
@@ -378,12 +390,8 @@ func (filter *TrzszFilter) uploadFiles(transfer *trzszTransfer, directory bool)
 		}
 	}
 
-	filter.progress.Store(nil)
-	if !config.Quiet {
-		filter.progress.Store(newTextProgressBar(filter.clientOut, filter.options.TerminalColumns,
-			config.TmuxPaneColumns, filter.trigger.tmuxPrefix))
-		defer filter.progress.Store(nil)
-	}
+	filter.createProgressBar(config.Quiet, config.TmuxPaneColumns)
+	defer filter.resetProgressBar()
 
 	remoteNames, err := transfer.sendFiles(files, filter.progress.Load())
 	if err != nil {
@@ -401,7 +409,6 @@ func (filter *TrzszFilter) handleTrzsz() {
 
 	defer func() {
 		transfer.cleanup()
-		showCursor(filter.clientOut)
 		filter.transfer.CompareAndSwap(transfer, nil)
 	}()
 

trzsz/progress.go

@@ -217,7 +217,7 @@ func (p *textProgressBar) onNum(num int64) {
 		return
 	}
 	p.fileCount = int(num)
-	hideCursor(p.writer)
+	p.hideCursor()
 }
 
 func (p *textProgressBar) onName(name string) {
@@ -258,9 +258,6 @@ func (p *textProgressBar) onDone() {
 	if p == nil {
 		return
 	}
-	if p.fileIdx == p.fileCount {
-		showCursor(p.writer)
-	}
 	if p.fileSize == 0 {
 		return
 	}
@@ -281,11 +278,19 @@ func (p *textProgressBar) setPause(pausing bool) {
 		return
 	}
 	if !pausing {
-		hideCursor(p.writer)
+		p.hideCursor()
 	}
 	p.pausing.Store(pausing)
 }
 
+func (p *textProgressBar) hideCursor() {
+	p.writeProgress("\x1b[?25l")
+}
+
+func (p *textProgressBar) showCursor() {
+	p.writeProgress("\x1b[?25h")
+}
+
 func (p *textProgressBar) writeProgress(progress string) {
 	data := []byte(progress)
 	if p.tmuxPrefix != "" {

trzsz/progress_test.go

@@ -345,11 +345,11 @@ func TestProgressWithMultiFiles(t *testing.T) {
 	progress.onDone()
 
 	assert.Equal(6, *callTimeNowCount)
-	writer.assertBufferCount(6)
+	writer.assertBufferCount(5)
 	writer.assertProgressText(1, 100, []string{"(1/2) 中文😀test.txt [", "] 10% | 100 B | 100 B/s | 00:09 ETA"})
 	writer.assertProgressText(2, 100, []string{"(1/2) 中文😀test.txt [", "] 100% | 1000 B | 1000 B/s | 00:00 ETA"})
 	writer.assertProgressText(3, 80, []string{"(2/2) 英文😀test.txt [", "] 15% | 300 B | 150 B/s | 00:11 ETA"})
-	writer.assertProgressText(5, 80, []string{"(2/2) 英文😀test.txt [", "] 100% | 1000 B/s | 00:00 ETA"})
+	writer.assertProgressText(4, 80, []string{"(2/2) 英文😀test.txt [", "] 100% | 1000 B/s | 00:00 ETA"})
 }
 
 func TestProgressInTmuxPane(t *testing.T) {
@@ -372,7 +372,7 @@ func TestProgressInTmuxPane(t *testing.T) {
 	progress.onDone()
 
 	assert.Equal(7, *callTimeNowCount)
-	writer.assertBufferCount(7)
+	writer.assertBufferCount(6)
 	writer.assertProgressText(1, 79, []string{"(1/2) 中文😀test.txt [", "] 10% | 100 B | 100 B/s | 00:09 ETA"})
 	assert.NotContains(writer.buffer[1], "\r")
 	assert.NotContains(writer.buffer[1], "\x1b[79D")
@@ -385,8 +385,8 @@ func TestProgressInTmuxPane(t *testing.T) {
 
 	writer.assertProgressText(4, 120, []string{"(2/2) 中文😀test2.txt [", "] 30% | 300 B | 300 B/s | 00:02 ETA"})
 
-	writer.assertProgressText(6, 120, []string{"(2/2) 中文😀test2.txt [", "] 100% | 1000 B | 1000 B/s | 00:00 ETA"})
-	assert.Contains(writer.buffer[6], "\r")
+	writer.assertProgressText(5, 120, []string{"(2/2) 中文😀test2.txt [", "] 100% | 1000 B | 1000 B/s | 00:00 ETA"})
+	assert.Contains(writer.buffer[5], "\r")
 }
 
 func TestProgressEllipsisString(t *testing.T) {