make spinner more general and use it in fingerprinting

debricked · Oct 9, 2023 · e39017d · e39017d
1 parent 6a394d6
commit e39017d
Show file tree

Hide file tree

Showing 4 changed files with 64 additions and 17 deletions.
diff --git a/internal/file/fingerprint.go b/internal/file/fingerprint.go
@@ -8,6 +8,8 @@ import (
 	"os"
 	"path/filepath"
 	"strings"
+
+	"github.com/debricked/cli/internal/tui"
 )
 
 var EXCLUDED_EXT = []string{
@@ -86,10 +88,13 @@ type IFingerprint interface {
 }
 
 type Fingerprinter struct {
+	spinnerManager tui.ISpinnerManager
 }
 
 func NewFingerprinter() *Fingerprinter {
-	return &Fingerprinter{}
+	return &Fingerprinter{
+		spinnerManager: tui.NewSpinnerManager("Fingerprinting", "0"),
+	}
 }
 
 type FileFingerprint struct {
@@ -112,7 +117,15 @@ func (f *Fingerprinter) FingerprintFiles(rootPath string, exclusions []string) (
 
 	fingerprints := Fingerprints{}
 
+	f.spinnerManager.Start()
+	spinnerMessage := "files processed"
+	spinner := f.spinnerManager.AddSpinner(spinnerMessage)
+
+	nbFiles := 0
+
 	err := filepath.Walk(rootPath, func(path string, fileInfo os.FileInfo, err error) error {
+		nbFiles++
+
 		if err != nil {
 			return err
 		}
@@ -128,9 +141,23 @@ func (f *Fingerprinter) FingerprintFiles(rootPath string, exclusions []string) (
 
 		fingerprints.Append(fingerprint)
 
+		if nbFiles%100 == 0 {
+			f.spinnerManager.SetSpinnerMessage(spinner, spinnerMessage, fmt.Sprintf("%d", nbFiles))
+		}
+
 		return nil
 	})
 
+	f.spinnerManager.SetSpinnerMessage(spinner, spinnerMessage, fmt.Sprintf("%d", nbFiles))
+
+	if err != nil {
+		spinner.Error()
+	} else {
+		spinner.Complete()
+	}
+
+	f.spinnerManager.Stop()
+
 	return fingerprints, err
 }
 

diff --git a/internal/resolution/scheduler.go b/internal/resolution/scheduler.go
@@ -33,7 +33,7 @@ func (scheduler *Scheduler) Schedule(jobs []job.IJob) (IResolution, error) {
 	scheduler.queue = make(chan queueItem, len(jobs))
 	scheduler.waitGroup.Add(len(jobs))
 
-	scheduler.spinnerManager = tui.NewSpinnerManager()
+	scheduler.spinnerManager = tui.NewSpinnerManager("Resolving", "waiting for worker")
 
 	for w := 1; w <= scheduler.workers; w++ {
 		go scheduler.worker()
@@ -75,16 +75,16 @@ func (scheduler *Scheduler) worker() {
 func (scheduler *Scheduler) updateStatus(item queueItem) {
 	for {
 		msg := <-item.job.ReceiveStatus()
-		tui.SetSpinnerMessage(item.spinner, item.job.GetFile(), msg)
+		scheduler.spinnerManager.SetSpinnerMessage(item.spinner, item.job.GetFile(), msg)
 	}
 }
 
 func (scheduler *Scheduler) finish(item queueItem) {
 	if item.job.Errors().HasError() {
-		tui.SetSpinnerMessage(item.spinner, item.job.GetFile(), "failed")
+		scheduler.spinnerManager.SetSpinnerMessage(item.spinner, item.job.GetFile(), "failed")
 		item.spinner.Error()
 	} else {
-		tui.SetSpinnerMessage(item.spinner, item.job.GetFile(), "done")
+		scheduler.spinnerManager.SetSpinnerMessage(item.spinner, item.job.GetFile(), "done")
 		item.spinner.Complete()
 	}
 }
diff --git a/internal/tui/spinner_manager.go b/internal/tui/spinner_manager.go
@@ -15,19 +15,22 @@ type ISpinnerManager interface {
 	AddSpinner(file string) *ysmrr.Spinner
 	Start()
 	Stop()
+	SetSpinnerMessage(spinner *ysmrr.Spinner, filename string, message string)
 }
 
 type SpinnerManager struct {
-	spinnerManager ysmrr.SpinnerManager
+	spinnerManager      ysmrr.SpinnerManager
+	baseString          string
+	spinnerStartMessage string
 }
 
-func NewSpinnerManager() SpinnerManager {
-	return SpinnerManager{ysmrr.NewSpinnerManager(ysmrr.WithSpinnerColor(colors.FgHiBlue))}
+func NewSpinnerManager(baseString string, spinnerStartMessage string) SpinnerManager {
+	return SpinnerManager{ysmrr.NewSpinnerManager(ysmrr.WithSpinnerColor(colors.FgHiBlue)), baseString, spinnerStartMessage}
 }
 
 func (sm SpinnerManager) AddSpinner(file string) *ysmrr.Spinner {
 	spinner := sm.spinnerManager.AddSpinner("")
-	SetSpinnerMessage(spinner, file, "waiting for worker")
+	sm.SetSpinnerMessage(spinner, file, sm.spinnerStartMessage)
 
 	return spinner
 }
@@ -40,7 +43,7 @@ func (sm SpinnerManager) Stop() {
 	sm.spinnerManager.Stop()
 }
 
-func SetSpinnerMessage(spinner *ysmrr.Spinner, filename string, message string) {
+func (sm SpinnerManager) SetSpinnerMessage(spinner *ysmrr.Spinner, filename string, message string) {
 	const maxNumberOfChars = 50
 	truncatedFilename := filename
 	if len(truncatedFilename) > maxNumberOfChars {
@@ -60,5 +63,5 @@ func SetSpinnerMessage(spinner *ysmrr.Spinner, filename string, message string)
 
 	}
 	file := color.YellowString(truncatedFilename)
-	spinner.UpdateMessage(fmt.Sprintf("Resolving %s: %s", file, message))
+	spinner.UpdateMessage(fmt.Sprintf("%s %s: %s", sm.baseString, file, message))
 }
diff --git a/internal/tui/spinner_manager_test.go b/internal/tui/spinner_manager_test.go
@@ -10,25 +10,35 @@ import (
 )
 
 func TestNewSpinnerManager(t *testing.T) {
-	spinnerManager := NewSpinnerManager()
+	spinnerManager := NewSpinnerManager(
+		"Resolving",
+		"waiting for worker",
+	)
+
 	assert.NotNil(t, spinnerManager)
 }
 
 func TestSetSpinnerMessage(t *testing.T) {
-	spinnerManager := NewSpinnerManager()
+	spinnerManager := NewSpinnerManager(
+		"Resolving",
+		"waiting for worker",
+	)
 	message := "test"
 	spinner := spinnerManager.AddSpinner(message)
 	assert.Contains(t, spinner.GetMessage(), fmt.Sprintf("Resolving %s: waiting for worker", color.YellowString(message)))
 
 	fileName := "file-name"
 	message = "new test message"
 
-	SetSpinnerMessage(spinner, fileName, message)
+	spinnerManager.SetSpinnerMessage(spinner, fileName, message)
 	assert.Contains(t, spinner.GetMessage(), fmt.Sprintf("Resolving %s: %s", color.YellowString(fileName), message))
 }
 
 func TestSetSpinnerMessageLongFilenameParts(t *testing.T) {
-	spinnerManager := NewSpinnerManager()
+	spinnerManager := NewSpinnerManager(
+		"Resolving",
+		"waiting for worker",
+	)
 	longFilenameParts := []string{
 		"directory",
 		"sub-directory################################################################",
@@ -43,7 +53,10 @@ func TestSetSpinnerMessageLongFilenameParts(t *testing.T) {
 }
 
 func TestSetSpinnerMessageLongFilenameManyDirs(t *testing.T) {
-	spinnerManager := NewSpinnerManager()
+	spinnerManager := NewSpinnerManager(
+		"Resolving",
+		"waiting for worker",
+	)
 	longFilenameParts := []string{
 		"directory",
 		"sub-directory",
@@ -70,7 +83,11 @@ func TestSetSpinnerMessageLongFilenameManyDirs(t *testing.T) {
 }
 
 func TestStartStop(t *testing.T) {
-	spinnerManager := NewSpinnerManager()
+	spinnerManager := NewSpinnerManager(
+		"Resolving",
+		"waiting for worker",
+	)
+
 	spinnerManager.Start()
 	spinnerManager.Stop()
 }