Improve decoupling for search and tui

Author: carhartl

search.go

@@ -10,17 +10,14 @@ import (
 	tea "github.com/charmbracelet/bubbletea"
 )
 
-type repoMsg struct {
-	repo repo
-}
 type repo struct {
 	path   string
 	status string
 }
 
 var excludeDirs = regexp.MustCompile(`.+/(\..+|node_modules)`) // Skip hidden directories (incl. .git) and node_modules
 
-func getRepos(path string, sub chan repoMsg) tea.Cmd {
+func getRepos(path string, sub chan repo) tea.Cmd {
 	return func() tea.Msg {
 		path, err := filepath.Abs(path)
 		if err != nil {
@@ -48,7 +45,7 @@ func getRepos(path string, sub chan repoMsg) tea.Cmd {
 					gi.Parse(buf)
 
 					if !gi.IsClean() {
-						sub <- repoMsg{repo: repo{path: repopath, status: gi.Summary()}}
+						sub <- repo{path: repopath, status: gi.Summary()}
 					}
 				}
 				return fs.SkipDir
@@ -61,9 +58,3 @@ func getRepos(path string, sub chan repoMsg) tea.Cmd {
 		return doneMsg{}
 	}
 }
-
-func waitForRepoStatus(sub chan repoMsg) tea.Cmd {
-	return func() tea.Msg {
-		return repoMsg(<-sub)
-	}
-}

tui.go

@@ -12,6 +12,9 @@ import (
 
 var docStyle = lipgloss.NewStyle().Margin(1, 2)
 
+type repoMsg struct {
+	repo
+}
 type doneMsg struct{}
 type errMsg error
 
@@ -31,7 +34,7 @@ func (r repo) FilterValue() string {
 type model struct {
 	list     list.Model
 	path     string
-	sub      chan repoMsg
+	sub      chan repo
 	quitting bool
 	err      error
 }
@@ -91,7 +94,14 @@ func initialModel(wd string) tea.Model {
 	l.SetSpinner(spinner.MiniDot)
 	l.SetStatusBarItemName("repository", "repositories")
 	l.ToggleSpinner()
-	return model{list: l, path: wd, sub: make(chan repoMsg)}
+	return model{list: l, path: wd, sub: make(chan repo)}
+}
+
+func waitForRepoStatus(sub chan repo) tea.Cmd {
+	return func() tea.Msg {
+		repo := <-sub
+		return repoMsg(repoMsg{repo: repo})
+	}
 }
 
 func openEditor(path string) tea.Cmd {