Browse Source

fix spinner.go

master v0.0.36
RealXLFD 2 months ago
parent
commit
bb708f60f2
  1. 14
      cli/spinner/spinner.go

14
cli/spinner/spinner.go

@ -188,14 +188,17 @@ func (s *Spinner) Finish(info ...string) {
} }
oldLength := utf8.RuneCountInString(s.msg) oldLength := utf8.RuneCountInString(s.msg)
s.msg = s.joinMsg(info...) s.msg = s.joinMsg(info...)
newLength := utf8.RuneCountInString(s.msg) gap := oldLength - utf8.RuneCountInString(s.msg)
s.run = false s.run = false
close(s.msgCh) close(s.msgCh)
s.exit.Lock() s.exit.Lock()
if gap < 0 {
gap = 0
}
fmt.Println( fmt.Println(
str.Join( str.Join(
"\r", s.suffix, green(_SUCCESS), " ", s.msg, "\r", s.suffix, green(_SUCCESS), " ", s.msg,
strings.Repeat(" ", oldLength-newLength), strings.Repeat(" ", gap),
), ),
) )
} }
@ -207,14 +210,17 @@ func (s *Spinner) Abort(info ...string) {
} }
oldLength := utf8.RuneCountInString(s.msg) oldLength := utf8.RuneCountInString(s.msg)
s.msg = s.joinMsg(info...) s.msg = s.joinMsg(info...)
newLength := utf8.RuneCountInString(s.msg) gap := oldLength - utf8.RuneCountInString(s.msg)
s.run = false s.run = false
close(s.msgCh) close(s.msgCh)
s.exit.Lock() s.exit.Lock()
if gap < 0 {
gap = 0
}
fmt.Println( fmt.Println(
str.Join( str.Join(
"\r", s.suffix, red(_FAILURE), " ", s.msg, "\r", s.suffix, red(_FAILURE), " ", s.msg,
strings.Repeat(" ", oldLength-newLength), strings.Repeat(" ", gap),
), ),
) )
} }

Loading…
Cancel
Save