prefer aec library over raw ANSI sequences

ndeloof · ndeloof · commit 9dc41379fc85 · 2025-12-11T08:32:21.000+01:00
Signed-off-by: Nicolas De Loof &lt;nicolas.deloof@gmail.com&gt;
diff --git a/cmd/formatter/ansi.go b/cmd/formatter/ansi.go
@@ -20,71 +20,70 @@ import (
 	"fmt"
 
 	"github.com/acarl005/stripansi"
+	"github.com/morikuni/aec"
 )
 
 var disableAnsi bool
 
-func ansi(code string) string {
-	return fmt.Sprintf("\033%s", code)
-}
-
 func saveCursor() {
 	if disableAnsi {
 		return
 	}
-	fmt.Print(ansi("7"))
+	// see https://github.com/morikuni/aec/pull/5
+	fmt.Print(aec.Save)
 }
 
 func restoreCursor() {
 	if disableAnsi {
 		return
 	}
-	fmt.Print(ansi("8"))
+	// see https://github.com/morikuni/aec/pull/5
+	fmt.Print(aec.Restore)
 }
 
 func showCursor() {
 	if disableAnsi {
 		return
 	}
-	fmt.Print(ansi("[?25h"))
+	fmt.Print(aec.Show)
 }
 
 func moveCursor(y, x int) {
 	if disableAnsi {
 		return
 	}
-	fmt.Print(ansi(fmt.Sprintf("[%d;%dH", y, x)))
+	fmt.Print(aec.Position(uint(y), uint(x)))
 }
 
 func carriageReturn() {
 	if disableAnsi {
 		return
 	}
-	fmt.Print(ansi(fmt.Sprintf("[%dG", 0)))
+	fmt.Print(aec.Column(0))
 }
 
 func clearLine() {
 	if disableAnsi {
 		return
 	}
 	// Does not move cursor from its current position
-	fmt.Print(ansi("[2K"))
+	fmt.Print(aec.EraseLine(aec.EraseModes.Tail))
 }
 
 func moveCursorUp(lines int) {
 	if disableAnsi {
 		return
 	}
 	// Does not add new lines
-	fmt.Print(ansi(fmt.Sprintf("[%dA", lines)))
+	fmt.Print(aec.Up(uint(lines)))
 }
 
 func moveCursorDown(lines int) {
 	if disableAnsi {
 		return
 	}
 	// Does not add new lines
-	fmt.Print(ansi(fmt.Sprintf("[%dB", lines)))
+	fmt.Print(aec.Down(uint(lines)))
 }
 
 func newLine() {
diff --git a/go.mod b/go.mod
@@ -34,7 +34,7 @@ require (
 	github.com/moby/patternmatcher v0.6.0
 	github.com/moby/sys/atomicwriter v0.1.0
 	github.com/moby/term v0.5.2
-	github.com/morikuni/aec v1.0.0
+	github.com/morikuni/aec v1.1.0
 	github.com/opencontainers/go-digest v1.0.0
 	github.com/opencontainers/image-spec v1.1.1
 	github.com/otiai10/copy v1.14.1
diff --git a/go.sum b/go.sum
@@ -283,8 +283,8 @@ github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJ
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A=
-github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
+github.com/morikuni/aec v1.1.0 h1:vBBl0pUnvi/Je71dsRrhMBtreIqNMYErSAbEeb8jrXQ=
+github.com/morikuni/aec v1.1.0/go.mod h1:xDRgiq/iw5l+zkao76YTKzKttOp2cwPEne25HDkJnBw=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=

Original file line number	Diff line number	Diff line change
`@@ -20,71 +20,70 @@ import (`
`20`	`20`	`"fmt"`
`21`	`21`
`22`	`22`	`"github.com/acarl005/stripansi"`
	`23`	`+ "github.com/morikuni/aec"`
`23`	`24`	`)`
`24`	`25`
`25`	`26`	`var disableAnsi bool`
`26`	`27`
`27`		`-func ansi(code string) string {`
`28`		`- return fmt.Sprintf("\033%s", code)`
`29`		`-}`
`30`		`-`
`31`	`28`	`func saveCursor() {`
`32`	`29`	`if disableAnsi {`
`33`	`30`	`return`
`34`	`31`	`}`
`35`		`- fmt.Print(ansi("7"))`
	`32`	`+ // see https://github.com/morikuni/aec/pull/5`
	`33`	`+ fmt.Print(aec.Save)`
`36`	`34`	`}`
`37`	`35`
`38`	`36`	`func restoreCursor() {`
`39`	`37`	`if disableAnsi {`
`40`	`38`	`return`
`41`	`39`	`}`
`42`		`- fmt.Print(ansi("8"))`
	`40`	`+ // see https://github.com/morikuni/aec/pull/5`
	`41`	`+ fmt.Print(aec.Restore)`
`43`	`42`	`}`
`44`	`43`
`45`	`44`	`func showCursor() {`
`46`	`45`	`if disableAnsi {`
`47`	`46`	`return`
`48`	`47`	`}`
`49`		`- fmt.Print(ansi("[?25h"))`
	`48`	`+ fmt.Print(aec.Show)`
`50`	`49`	`}`
`51`	`50`
`52`	`51`	`func moveCursor(y, x int) {`
`53`	`52`	`if disableAnsi {`
`54`	`53`	`return`
`55`	`54`	`}`
`56`		`- fmt.Print(ansi(fmt.Sprintf("[%d;%dH", y, x)))`
	`55`	`+ fmt.Print(aec.Position(uint(y), uint(x)))`
`57`	`56`	`}`
`58`	`57`
`59`	`58`	`func carriageReturn() {`
`60`	`59`	`if disableAnsi {`
`61`	`60`	`return`
`62`	`61`	`}`
`63`		`- fmt.Print(ansi(fmt.Sprintf("[%dG", 0)))`
	`62`	`+ fmt.Print(aec.Column(0))`
`64`	`63`	`}`
`65`	`64`
`66`	`65`	`func clearLine() {`
`67`	`66`	`if disableAnsi {`
`68`	`67`	`return`
`69`	`68`	`}`
`70`	`69`	`// Does not move cursor from its current position`
`71`		`- fmt.Print(ansi("[2K"))`
	`70`	`+ fmt.Print(aec.EraseLine(aec.EraseModes.Tail))`
`72`	`71`	`}`
`73`	`72`
`74`	`73`	`func moveCursorUp(lines int) {`
`75`	`74`	`if disableAnsi {`
`76`	`75`	`return`
`77`	`76`	`}`
`78`	`77`	`// Does not add new lines`
`79`		`- fmt.Print(ansi(fmt.Sprintf("[%dA", lines)))`
	`78`	`+ fmt.Print(aec.Up(uint(lines)))`
`80`	`79`	`}`
`81`	`80`
`82`	`81`	`func moveCursorDown(lines int) {`
`83`	`82`	`if disableAnsi {`
`84`	`83`	`return`
`85`	`84`	`}`
`86`	`85`	`// Does not add new lines`
`87`		`- fmt.Print(ansi(fmt.Sprintf("[%dB", lines)))`
	`86`	`+ fmt.Print(aec.Down(uint(lines)))`
`88`	`87`	`}`
`89`	`88`
`90`	`89`	`func newLine() {`