default max term height
This commit is contained in:
parent
588a97dbef
commit
b0f28d178a
@ -64,7 +64,7 @@ func formatDuration(d time.Duration) string {
|
|||||||
func (b *Bar) String() string {
|
func (b *Bar) String() string {
|
||||||
termWidth, _, err := term.GetSize(int(os.Stderr.Fd()))
|
termWidth, _, err := term.GetSize(int(os.Stderr.Fd()))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
termWidth = 80
|
termWidth = defaultTermWidth
|
||||||
}
|
}
|
||||||
|
|
||||||
var pre strings.Builder
|
var pre strings.Builder
|
||||||
|
@ -4,8 +4,16 @@ import (
|
|||||||
"bufio"
|
"bufio"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
|
"os"
|
||||||
"sync"
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
|
"golang.org/x/term"
|
||||||
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
defaultTermWidth = 80
|
||||||
|
defaultTermHeight = 24
|
||||||
)
|
)
|
||||||
|
|
||||||
type State interface {
|
type State interface {
|
||||||
@ -83,6 +91,11 @@ func (p *Progress) Add(key string, state State) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (p *Progress) render() {
|
func (p *Progress) render() {
|
||||||
|
_, termHeight, err := term.GetSize(int(os.Stderr.Fd()))
|
||||||
|
if err != nil {
|
||||||
|
termHeight = defaultTermHeight
|
||||||
|
}
|
||||||
|
|
||||||
p.mu.Lock()
|
p.mu.Lock()
|
||||||
defer p.mu.Unlock()
|
defer p.mu.Unlock()
|
||||||
|
|
||||||
@ -102,8 +115,9 @@ func (p *Progress) render() {
|
|||||||
fmt.Fprint(p.w, "\033[1G")
|
fmt.Fprint(p.w, "\033[1G")
|
||||||
|
|
||||||
// render progress lines
|
// render progress lines
|
||||||
for i, state := range p.states {
|
maxHeight := min(len(p.states), termHeight)
|
||||||
fmt.Fprint(p.w, state.String(), "\033[K")
|
for i := len(p.states) - maxHeight; i < len(p.states); i++ {
|
||||||
|
fmt.Fprint(p.w, p.states[i].String(), "\033[K")
|
||||||
if i < len(p.states)-1 {
|
if i < len(p.states)-1 {
|
||||||
fmt.Fprint(p.w, "\n")
|
fmt.Fprint(p.w, "\n")
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user