fix(state): State's local varriables are now private

Signed-off-by: dark0dave <dark0dave@mykolab.com>

Author: dark0dave

cmd/cmds.go

@@ -7,25 +7,25 @@ type ContentMsg string
 type PathMsg string
 type TitleMsg string
 
-func sendSelectedFile(areapath string) tea.Cmd {
+func SendSelectedFile(areapath string) tea.Cmd {
 	return func() tea.Msg {
 		return SelectedFilePath(areapath)
 	}
 }
 
-func sendContentCmd(content string) tea.Cmd {
+func SendContentCmd(content string) tea.Cmd {
 	return func() tea.Msg {
 		return ContentMsg(content)
 	}
 }
 
-func sendPathCmd(path string) tea.Cmd {
+func SendPathCmd(path string) tea.Cmd {
 	return func() tea.Msg {
 		return PathMsg(path)
 	}
 }
 
-func sendTitleCmd(content string) tea.Cmd {
+func SendTitleCmd(content string) tea.Cmd {
 	return func() tea.Msg {
 		return TitleMsg(content)
 	}

cmd/directory-picker.go

@@ -2,6 +2,7 @@ package cmd
 
 import (
 	"errors"
+	"os"
 	"strings"
 	"time"
 
@@ -62,8 +63,14 @@ func (d directoryPicker) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	case tea.KeyMsg:
 		switch msg.String() {
 		case "e":
+			fileInfo, err := os.Stat(d.selectedFile)
+			if fileInfo.IsDir() != d.filepicker.DirAllowed || err != nil {
+				d.err = errors.New(d.selectedFile + " is not valid.")
+				d.selectedFile = ""
+				return d, clearErrorAfter(2 * time.Second)
+			}
 			if d.selectedFile != "" {
-				return state.SetAndGetNextCommand(d), tea.Sequence(sendPathCmd(d.startingDir), sendSelectedFile(d.selectedFile))
+				return state.SetAndGetNextCommand(d), tea.Sequence(SendPathCmd(d.startingDir), SendSelectedFile(d.selectedFile))
 			}
 		case "q", "esc":
 			return state.PreviousCommand(), nil

cmd/initial.go

@@ -6,10 +6,11 @@ import (
 	list "github.com/charmbracelet/bubbles/list"
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/lipgloss"
+	"github.com/dark0dave/infinity_dialog/pkg/nav"
 )
 
 var (
-	state    = NewState()
+	state    = nav.NewState()
 	docStyle = lipgloss.NewStyle().Margin(1, 2)
 	width    = 0
 	height   = 0
@@ -70,13 +71,13 @@ func (i initial) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 				t := NewTree()
 				v := NewFileView()
 				state.SetNextCommand(d).SetNextCommand(f).SetNextCommand(t).SetNextCommand(v)
-				return state.SetAndGetNextCommand(i), sendSelectedFile(current_path)
+				return state.SetAndGetNextCommand(i), SendSelectedFile(current_path)
 			case "Discover":
 				d := NewDirectoryPicker(true, "Select a Mod Directory")
 				l := NewList()
 				f := NewFileView()
 				state.SetNextCommand(d).SetNextCommand(l).SetNextCommand(f)
-				return state.SetAndGetNextCommand(i), sendSelectedFile(current_path)
+				return state.SetAndGetNextCommand(i), SendSelectedFile(current_path)
 			}
 		}
 	}

cmd/list-varriables.go

@@ -130,8 +130,7 @@ func (l listVariables) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 				content += s
 			}
 			title := strings.Join(l.table.SelectedRow()[:3], " ")
-			state.setCurrentCommand(l)
-			return state.NextCommand(), tea.Sequence(sendTitleCmd(title), sendContentCmd(content))
+			return state.SetAndGetNextCommand(l), tea.Sequence(SendTitleCmd(title), SendContentCmd(content))
 		}
 	}
 	var cmd tea.Cmd

cmd/tree.go

@@ -85,9 +85,9 @@ func (n nested) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		case "e", "enter":
 			nodes := n.tree.Nodes()
 			node, _ := getSelected(&n, &nodes, 0)
-			return state.SetAndGetNextCommand(n), sendPathCmd(node.Desc)
+			return state.SetAndGetNextCommand(n), SendPathCmd(node.Desc)
 		case "q", "esc":
-			return state.next.SetAndGetPreviousCommand(n), nil
+			return state.SetAndGetPreviousCommand(n), nil
 		case "ctrl+c", "ctrl+d":
 			return n, tea.Quit
 		}

cmd/state.go pkg/nav/state.gocmd/state.go renamed to pkg/nav/state.go

@@ -1,22 +1,22 @@
-package cmd
+package nav
 
 import tea "github.com/charmbracelet/bubbletea"
 
 var position = 0
 
-type State struct {
+type state struct {
 	model    tea.Model
-	next     *State
-	previous *State
+	next     *state
+	previous *state
 }
 
-func NewState() *State {
-	return &State{}
+func NewState() *state {
+	return &state{}
 }
 
-func (s *State) setCurrentCommand(m tea.Model) {
+func (s *state) setCurrentCommand(m tea.Model) {
 	if s.model == nil {
-		*s = State{
+		*s = state{
 			model:    m,
 			next:     s.next,
 			previous: s.previous,
@@ -30,7 +30,7 @@ func (s *State) setCurrentCommand(m tea.Model) {
 	s.model = m
 }
 
-func (s *State) NextCommand() tea.Model {
+func (s *state) NextCommand() tea.Model {
 	position += 1
 	for range position {
 		if s.next != nil {
@@ -41,9 +41,9 @@ func (s *State) NextCommand() tea.Model {
 	return m
 }
 
-func (s *State) SetNextCommand(m tea.Model) *State {
+func (s *state) SetNextCommand(m tea.Model) *state {
 	if s.next == nil {
-		s.next = &State{
+		s.next = &state{
 			model:    m,
 			next:     nil,
 			previous: s,
@@ -54,12 +54,12 @@ func (s *State) SetNextCommand(m tea.Model) *State {
 	}
 }
 
-func (s *State) SetAndGetNextCommand(m tea.Model) tea.Model {
+func (s *state) SetAndGetNextCommand(m tea.Model) tea.Model {
 	s.setCurrentCommand(m)
 	return s.NextCommand()
 }
 
-func (s *State) PreviousCommand() tea.Model {
+func (s *state) PreviousCommand() tea.Model {
 	position -= 1
 	for range position {
 		if s.next != nil {
@@ -70,9 +70,9 @@ func (s *State) PreviousCommand() tea.Model {
 	return m
 }
 
-func (s *State) SetPreviousCommand(m tea.Model) *State {
+func (s *state) SetPreviousCommand(m tea.Model) *state {
 	if s.previous == nil {
-		s.previous = &State{
+		s.previous = &state{
 			model:    m,
 			next:     s,
 			previous: nil,
@@ -83,7 +83,7 @@ func (s *State) SetPreviousCommand(m tea.Model) *State {
 	}
 }
 
-func (s *State) SetAndGetPreviousCommand(m tea.Model) tea.Model {
+func (s *state) SetAndGetPreviousCommand(m tea.Model) tea.Model {
 	s.setCurrentCommand(m)
 	return s.PreviousCommand()
 }