fix: spinner

gabotechs · Jan 31, 2024 · 2fac6ee · 2fac6ee
1 parent f6feb15
commit 2fac6ee
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 9 deletions.
diff --git a/internal/dep_tree/dep_tree.go b/internal/dep_tree/dep_tree.go
@@ -36,7 +36,7 @@ type DepTree[T any] struct {
 	// callbacks
 	onStartLoading   func()
 	onNodeStartLoad  func(*graph.Node[T])
-	onNodeFinishLoad func([]*graph.Node[T])
+	onNodeFinishLoad func(*graph.Node[T], []*graph.Node[T])
 	onFinishLoad     func()
 	// cache
 	longestPathCache map[string]int
@@ -51,7 +51,7 @@ func NewDepTree[T any](parser NodeParser[T], ids []string) *DepTree[T] {
 		Cycles:           orderedmap.NewOrderedMap[[2]string, graph.Cycle](),
 		onStartLoading:   func() {},
 		onNodeStartLoad:  func(_ *graph.Node[T]) {},
-		onNodeFinishLoad: func(_ []*graph.Node[T]) {},
+		onNodeFinishLoad: func(_ *graph.Node[T], _ []*graph.Node[T]) {},
 		onFinishLoad:     func() {},
 		longestPathCache: map[string]int{},
 	}
@@ -70,20 +70,20 @@ func (dt *DepTree[T]) WithStdErrLoader() *DepTree[T] {
 		progressbar.OptionSetRenderBlankState(true),
 	)
 	diff := make(map[string]bool)
-	total := 0
+	done := 0
 	dt.onStartLoading = func() {
 		bar.Reset()
 	}
 	dt.onNodeStartLoad = func(n *graph.Node[T]) {
-		total += 1
-		_ = bar.Set(total)
-		bar.Describe(fmt.Sprintf("(%d/%d) Loading %s...", total, len(diff), dt.NodeParser.Display(n)))
+		done += 1
+		_ = bar.Set(done)
+		bar.Describe(fmt.Sprintf("(%d/%d) Loading %s...", done, len(diff), dt.NodeParser.Display(n)))
 	}
-	dt.onNodeFinishLoad = func(ns []*graph.Node[T]) {
+	dt.onNodeFinishLoad = func(n *graph.Node[T], ns []*graph.Node[T]) {
 		for _, n := range ns {
 			diff[n.Id] = true
 		}
-		bar.ChangeMax(len(diff))
+		bar.Describe(fmt.Sprintf("(%d/%d) Loading %s...", done, len(diff), dt.NodeParser.Display(n)))
 	}
 	dt.onFinishLoad = func() {
 		bar.Describe("Finished loading")

diff --git a/internal/dep_tree/load.go b/internal/dep_tree/load.go
@@ -51,7 +51,7 @@ func (dt *DepTree[T]) LoadGraph() error {
 				node.AddErrors(err)
 				continue
 			}
-			dt.onNodeFinishLoad(deps)
+			dt.onNodeFinishLoad(node, deps)
 
 			for _, dep := range deps {
 				// No own child.

diff --git a/internal/dep_tree/load_test.go b/internal/dep_tree/load_test.go
@@ -4,6 +4,7 @@ import (
 	"strconv"
 	"testing"
 
+	"github.com/gabotechs/dep-tree/internal/graph"
 	"github.com/stretchr/testify/require"
 )
 
@@ -44,6 +45,46 @@ func TestLoadDeps_ErrorHandle(t *testing.T) {
 	a.ErrorContains(node2.Errors[0], "no negative children")
 }
 
+func TestLoadDeps_Callbacks(t *testing.T) {
+	a := require.New(t)
+
+	testGraph := &TestParser{
+		Spec: [][]int{
+			0: {1},
+			1: {2},
+			2: {0, 3},
+			3: {4},
+			4: {3},
+			5: {},
+		},
+	}
+
+	dt := NewDepTree[[]int](testGraph, []string{"5", "0"})
+	startLoad := 0
+	startNode := 0
+	finishLoad := 0
+	finishNode := 0
+	dt.onStartLoading = func() {
+		startLoad++
+	}
+	dt.onFinishLoad = func() {
+		finishLoad++
+	}
+	dt.onNodeStartLoad = func(_ *graph.Node[[]int]) {
+		startNode++
+	}
+	dt.onNodeFinishLoad = func(_ *graph.Node[[]int], _ []*graph.Node[[]int]) {
+		finishNode++
+	}
+	err := dt.LoadGraph()
+	a.NoError(err)
+
+	a.Equal(1, startLoad)
+	a.Equal(6, startNode)
+	a.Equal(1, finishLoad)
+	a.Equal(6, finishNode)
+}
+
 func TestLoadDeps_loadGraph(t *testing.T) {
 	tests := []struct {
 		Name        string