milarin/statview
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

removed done chan and implemented Hide() method

Browse Source
This commit is contained in:
milarin 2023-03-10 22:34:04 +01:00
parent 5cb77ec486
commit d438d90578
1 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
view.go
View File

@ -1,6 +1,7 @@
package statview package statview
import ( import (
"fmt"
"io" "io"
"os" "os"
"sort" "sort"
@ -19,7 +20,6 @@ type View[K comparable] struct {
wg *sync.WaitGroup wg *sync.WaitGroup
reportCh chan report[K] reportCh chan report[K]
doneCh chan struct{}
} }
func New[K comparable]() *View[K] { func New[K comparable]() *View[K] {
@ -33,22 +33,33 @@ func NewForWriter[K comparable](w io.Writer) *View[K] {
taskMap: map[K]struct{}{}, taskMap: map[K]struct{}{},
reportCh: make(chan report[K], 100), reportCh: make(chan report[K], 100),
doneCh: make(chan struct{}, 1),
lastReports: map[K]report[K]{}, lastReports: map[K]report[K]{},
wg: &sync.WaitGroup{}, wg: &sync.WaitGroup{},
} }
} }
func (v *View[K]) Show() { func (v *View[K]) Show() {
go v.WaitForAllTasks() v.consumeReports(true)
}
func (v *View[K]) Hide() {
v.consumeReports(false)
}
func (v *View[K]) consumeReports(printReports bool) {
go func() {
defer close(v.reportCh)
v.wg.Wait()
}()
for status := range v.reportCh { for status := range v.reportCh {
v.lastReports[status.ID] = status v.lastReports[status.ID] = status
v.Add(status.ID) v.Add(status.ID)
if printReports {
v.print() v.print()
} }
}
v.doneCh <- struct{}{}
} }
func (v *View[K]) SortFunc(f func(i, j K) bool) { func (v *View[K]) SortFunc(f func(i, j K) bool) {
@ -76,14 +87,9 @@ func (v *View[K]) Report(task K, status string) {
} }
func (v *View[K]) Done(task K) { func (v *View[K]) Done(task K) {
if _, ok := v.taskMap[task]; !ok {
panic(fmt.Sprintf("unreported task marked as done: %v", v))
}
v.wg.Done() v.wg.Done()
} }
func (v *View[K]) WaitForAllTasks() {
go func() {
defer close(v.reportCh)
v.wg.Wait()
}()
<-v.doneCh
}