feat: sorting modules, multiple spinners

Author: chaindead

internal/tui/model.go

@@ -5,7 +5,6 @@ import (
 	"github.com/charmbracelet/bubbles/progress"
 	"github.com/charmbracelet/bubbles/spinner"
 	tea "github.com/charmbracelet/bubbletea"
-	"github.com/charmbracelet/lipgloss"
 
 	"github.com/chaindead/modup/internal/deps"
 )
@@ -15,7 +14,7 @@ type model struct {
 	// scan mode
 	packages modules
 	modules  []deps.Module
-	scanning []string
+	scanning namedSpinners
 
 	// choose mode
 	list  list.Model
@@ -37,13 +36,9 @@ type model struct {
 }
 
 func NewModel() model {
-	p := newProgress()
-	s := spinner.New()
-	s.Spinner = spinner.MiniDot
-	s.Style = lipgloss.NewStyle().Foreground(lipgloss.Color("63"))
 	return model{
-		spinner:  s,
-		progress: p,
+		spinner:  newSpinner(),
+		progress: newProgress(),
 		scanning: nil,
 	}
 }

internal/tui/modules.go

@@ -13,8 +13,7 @@ type modules struct {
 	cnt     int
 	mu      *sync.RWMutex
 
-	queue    []string
-	scanning []string
+	queue []string
 }
 
 func createModules(packages []string) modules {
@@ -43,14 +42,3 @@ func (m modules) isFinished() bool {
 func (m modules) progressFloat() float64 {
 	return float64(m.current) / float64(m.cnt)
 }
-
-func remove(slice []string, s string) []string {
-	for i, p := range slice {
-		if p == s {
-			slice = append(slice[:i], slice[i+1:]...)
-			break
-		}
-	}
-
-	return slice
-}

internal/tui/slice_spin.go

@@ -0,0 +1,24 @@
+package tui
+
+import "github.com/charmbracelet/bubbles/spinner"
+
+type namedSpinner struct {
+	name string
+	spin spinner.Model
+}
+
+type namedSpinners []namedSpinner
+
+func (s namedSpinners) remove(name string) namedSpinners {
+	for i, p := range s {
+		if p.name == name {
+			return append(s[:i], s[i+1:]...)
+		}
+	}
+
+	return s
+}
+
+func (s namedSpinners) lastSpinner() spinner.Model {
+	return s[len(s)-1].spin
+}

internal/tui/styles.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 
 	"github.com/charmbracelet/bubbles/progress"
+	"github.com/charmbracelet/bubbles/spinner"
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/lipgloss"
 )
@@ -31,6 +32,13 @@ func newProgress() progress.Model {
 	)
 }
 
+func newSpinner() spinner.Model {
+	s := spinner.New()
+	s.Spinner = spinner.MiniDot
+	s.Style = lipgloss.NewStyle().Foreground(lipgloss.Color("63"))
+	return s
+}
+
 func stepPrint(template string, args ...interface{}) tea.Cmd {
 	line := stepIcon.Render() + " " + fmt.Sprintf(template, args...)
 

internal/tui/update.go

@@ -2,10 +2,13 @@ package tui
 
 import (
 	"fmt"
+	"sort"
 
 	"github.com/charmbracelet/bubbles/progress"
 	"github.com/charmbracelet/bubbles/spinner"
 	tea "github.com/charmbracelet/bubbletea"
+
+	"github.com/chaindead/modup/internal/deps"
 )
 
 func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
@@ -33,7 +36,19 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 
 	case spinner.TickMsg:
 		var cmd tea.Cmd
-		m.spinner, cmd = m.spinner.Update(msg)
+
+		if msg.ID == m.spinner.ID() {
+			m.spinner, cmd = m.spinner.Update(msg)
+			return m, cmd
+		}
+
+		for i := range m.scanning {
+			if msg.ID == m.scanning[i].spin.ID() {
+				m.scanning[i].spin, cmd = m.scanning[i].spin.Update(msg)
+				break
+			}
+		}
+
 		return m, cmd
 	case progress.FrameMsg:
 		progressModel, cmd := m.progress.Update(msg)
@@ -64,11 +79,17 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 			return m, nil
 		}
 
-		m.scanning = append(m.scanning, pkg)
-		return m, getPkgInfo(pkg)
+		m.scanning = append(m.scanning, namedSpinner{
+			name: pkg,
+			spin: newSpinner(),
+		})
+		return m, tea.Batch(
+			getPkgInfo(pkg),
+			m.scanning.lastSpinner().Tick,
+		)
 	case getPackageInfoMsg:
 		m.packages.current++
-		m.scanning = remove(m.scanning, msg.mod.Path)
+		m.scanning = m.scanning.remove(msg.mod.Path)
 		if msg.mod.Updatable {
 			m.modules = append(m.modules, msg.mod)
 		}
@@ -91,6 +112,7 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 				tea.Quit,
 			)
 		}
+		m.modules = sortModules(m.modules)
 
 		return m, tea.Sequence(
 			textPrint("%s %s", mark, pkg),
@@ -153,3 +175,18 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 
 	return m, nil
 }
+
+var categoryMap = map[string]int{
+	"minor":      1,
+	"patch":      2,
+	"prerelease": 3,
+	"metadata":   4,
+}
+
+func sortModules(ms []deps.Module) []deps.Module {
+	sort.Slice(ms, func(i, j int) bool {
+		return categoryMap[ms[i].UpdateCategory] < categoryMap[ms[j].UpdateCategory]
+	})
+
+	return ms
+}

internal/tui/views.go

@@ -36,8 +36,8 @@ func (m model) viewScan() string {
 
 	var lines []string
 	for _, p := range m.scanning {
-		name := currentPkgNameStyle.Render(p)
-		lines = append(lines, m.spinner.View()+" Scanning "+name)
+		name := currentPkgNameStyle.Render(p.name)
+		lines = append(lines, p.spin.View()+" Scanning "+name)
 	}
 
 	body := strings.Join(lines, "\n")