aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2018-09-28 23:41:51 +0200
committerDimitri Sokolyuk <demon@dim13.org>2018-09-28 23:41:51 +0200
commit1a53d5709817c7fb2b23415ba809a42f91b578eb (patch)
tree92e784d3f80d31fc7c969ce01b10bdacba5c27fe
parentbece9f42037edf51bca608351123870bcc189dd6 (diff)
...
-rw-r--r--cmd/progress/main.go2
-rw-r--r--cmd/progress/progress.go7
2 files changed, 3 insertions, 6 deletions
diff --git a/cmd/progress/main.go b/cmd/progress/main.go
index b387c0c..9a839d8 100644
--- a/cmd/progress/main.go
+++ b/cmd/progress/main.go
@@ -16,7 +16,7 @@ func main() {
p := NewProgress(5*time.Second, 7*time.Second, 8*time.Second)
for i := 0; i < 8; i++ {
- p.Update(dev)
+ blinkstick.Set(dev, p.Update()...)
time.Sleep(time.Second)
}
diff --git a/cmd/progress/progress.go b/cmd/progress/progress.go
index c461c01..e886c0f 100644
--- a/cmd/progress/progress.go
+++ b/cmd/progress/progress.go
@@ -2,10 +2,7 @@ package main
import (
"image/color"
- "io"
"time"
-
- "dim13.org/blinkstick"
)
var (
@@ -35,7 +32,7 @@ func NewProgress(soft, hard, end time.Duration) Progress {
}
}
-func (p *Progress) Update(w io.Writer) {
+func (p *Progress) Update() []color.Color {
done := time.Since(p.start)
switch {
case p.hard < done:
@@ -45,6 +42,6 @@ func (p *Progress) Update(w io.Writer) {
default:
p.f[p.n] = green
}
- blinkstick.Set(w, p.f...)
p.n = (p.n + 1) % 8
+ return p.f
}