fix: Restarting and refreshing

Author: dploeger

internal/models/main_screen_update.go

@@ -5,7 +5,6 @@ import (
 	"github.com/charmbracelet/bubbles/key"
 	"github.com/charmbracelet/bubbles/list"
 	tea "github.com/charmbracelet/bubbletea"
-	"github.com/thoas/go-funk"
 )
 
 // Update holds the main controlling code for the applcation.
@@ -72,15 +71,6 @@ func (m MainModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	case InstancesLoadedMsg:
 		m.loadedItems = true
 		return m, nil
-	case ReloadItemMsg:
-		i := funk.IndexOf(m.List.Items(), func(e list.Item) bool {
-			return e.(InstanceItem).Name == msg.item.Name && e.(InstanceItem).Path == msg.item.Path
-		})
-		m.ItemsToRefresh = append(m.ItemsToRefresh, RefreshableItem{
-			index: i,
-			item:  msg.item,
-		})
-		return m, nil
 	case ReloadItemsMsg:
 		for len(m.List.Items()) > 0 {
 			m.List.RemoveItem(0)
@@ -96,15 +86,24 @@ func (m MainModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	case RunCloudControlMsg:
 		return m, RunCloudControlHandler(m)
 	case StartMsg:
-		return m, StartHandler(m)
+		return m, tea.Sequence(DisableList, tea.ClearScreen, StartHandler(m), tea.ClearScreen, EnableList)
 	case StopMsg:
-		return m, StopHandler(m)
+		return m, tea.Sequence(DisableList, tea.ClearScreen, StopHandler(m), tea.ClearScreen, EnableList)
+	case RestartMsg:
+		return m, tea.Sequence(DisableList, tea.ClearScreen, StopHandler(m), StartHandler(m), tea.ClearScreen, EnableList)
 	case ShowLogMsg:
 		return ShowLogHandler(m)
 
 	case RefreshTickMsg:
 		if m.loadedItems {
 			var refreshCmds []tea.Cmd
+			m.ItemsToRefresh = nil
+			for index, item := range m.List.Items() {
+				m.ItemsToRefresh = append(m.ItemsToRefresh, RefreshableItem{
+					index,
+					item.(InstanceItem),
+				})
+			}
 			for _, itemToRefresh := range m.ItemsToRefresh {
 				refreshCmds = append(refreshCmds, func(i RefreshableItem) tea.Cmd {
 					return func() tea.Msg {
@@ -199,7 +198,7 @@ func (m MainModel) keyHandler(msg tea.KeyMsg) (MainModel, tea.Cmd) {
 	case key.Matches(msg, m.keys.Start):
 		return m, Start
 	case key.Matches(msg, m.keys.Restart):
-		return m, tea.Sequence(Stop, Start)
+		return m, Restart
 	case key.Matches(msg, m.keys.ShowLog):
 		return m, ShowLog
 	}

internal/models/messages.go

@@ -80,25 +80,13 @@ func LoadInstanceHandler(m MainModel, basePath string, name string) (MainModel,
 	if r != nil {
 		ri := r.(RefreshableItem)
 		cmd := m.List.SetItem(ri.index, item)
-		if !item.State.Running || item.State.CCCStatus == adapters.CCCReady {
-			m.ItemsToRefresh = funk.Filter(m.ItemsToRefresh, func(e RefreshableItem) bool {
-				return e.index != ri.index
-			}).([]RefreshableItem)
-		}
 		if cmd != nil {
 			return m, cmd
 		}
 		return m, nil
 	}
 
-	itemIndex := len(m.List.Items())
-	if item.State.Running && item.State.CCCStatus != adapters.CCCReady {
-		m.ItemsToRefresh = append(m.ItemsToRefresh, RefreshableItem{
-			item:  item,
-			index: itemIndex,
-		})
-	}
-	m.List.InsertItem(itemIndex, item)
+	m.List.InsertItem(len(m.List.Items()), item)
 	return m, nil
 }
 
@@ -150,29 +138,25 @@ func OpenCCCHandler(m MainModel) (MainModel, tea.Cmd) {
 type RefreshTickMsg time.Time
 
 func RefreshTick() tea.Cmd {
-	return tea.Tick(3*time.Second, func(t time.Time) tea.Msg {
+	return tea.Tick(5*time.Second, func(t time.Time) tea.Msg {
 		return RefreshTickMsg(t)
 	})
 }
 
-// The ReloadItemMsg places the given item in MainModel.ItemsToRefresh
-type ReloadItemMsg struct {
-	item InstanceItem
-}
-
-func ReloadItem(item InstanceItem) tea.Msg {
-	return ReloadItemMsg{
-		item: item,
-	}
-}
-
 // The ReloadItemsMsg triggers reloading all instances
 type ReloadItemsMsg struct{}
 
 func ReloadItems() tea.Msg {
 	return ReloadItemsMsg{}
 }
 
+// RestartMsg triggers restarting an instance
+type RestartMsg struct{}
+
+func Restart() tea.Msg {
+	return RestartMsg{}
+}
+
 // The RunCloudControlMsg triggers running CloudControl
 type RunCloudControlMsg struct{}
 
@@ -259,31 +243,16 @@ func Start() tea.Msg {
 // StartHandler uses adapters.BaseAdapter.StartCloudControl to start an instance
 func StartHandler(m MainModel) tea.Cmd {
 	item := m.List.SelectedItem().(InstanceItem)
-	return tea.Sequence(
-		DisableList,
-		tea.ClearScreen,
-		func() tea.Msg {
-			var cmds []tea.Cmd
-			if !funk.Contains(m.ItemsToRefresh, func(e RefreshableItem) bool {
-				return e.item.ID() == item.ID()
-			}) {
-				cmds = append(cmds, func() tea.Cmd {
-					return func() tea.Msg {
-						return ReloadItem(item)
-					}
-				}())
-			}
-			if err := m.Adapter.StartCloudControl(item.Path, item.Name); err != nil {
-				cmds = append(cmds, m.List.NewStatusMessage(internal.ErrorMessageStyle(fmt.Sprintf("Can not start CloudControl: %s", err.Error()))))
-			}
-			if cmds != nil {
-				return tea.Batch(cmds...)()
-			}
-			return nil
-		},
-		tea.ClearScreen,
-		EnableList,
-	)
+	return func() tea.Msg {
+		var cmds []tea.Cmd
+		if err := m.Adapter.StartCloudControl(item.Path, item.Name); err != nil {
+			cmds = append(cmds, m.List.NewStatusMessage(internal.ErrorMessageStyle(fmt.Sprintf("Can not start CloudControl: %s", err.Error()))))
+		}
+		if cmds != nil {
+			return tea.Batch(cmds...)()
+		}
+		return nil
+	}
 }
 
 // StopMsg is used to stop an instance.
@@ -296,31 +265,16 @@ func Stop() tea.Msg {
 // StopHandler uses adapters.BaseAdapter.StopCloudControl to stop an instance.
 func StopHandler(m MainModel) tea.Cmd {
 	item := m.List.SelectedItem().(InstanceItem)
-	return tea.Sequence(
-		DisableList,
-		tea.ClearScreen,
-		func() tea.Msg {
-			var cmds []tea.Cmd
-			if !funk.Contains(m.ItemsToRefresh, func(e RefreshableItem) bool {
-				return e.index == m.List.Index()
-			}) {
-				cmds = append(cmds, func(item InstanceItem) tea.Cmd {
-					return func() tea.Msg {
-						return ReloadItem(item)
-					}
-				}(item))
-			}
-			if err := m.Adapter.StopCloudControl(item.Path, item.Name, true); err != nil {
-				cmds = append(cmds, m.List.NewStatusMessage(internal.ErrorMessageStyle(fmt.Sprintf("Can not start CloudControl: %s", err.Error()))))
-			}
-			if cmds != nil {
-				return tea.Batch(cmds...)()
-			}
-			return nil
-		},
-		tea.ClearScreen,
-		EnableList,
-	)
+	return func() tea.Msg {
+		var cmds []tea.Cmd
+		if err := m.Adapter.StopCloudControl(item.Path, item.Name, true); err != nil {
+			cmds = append(cmds, m.List.NewStatusMessage(internal.ErrorMessageStyle(fmt.Sprintf("Can not start CloudControl: %s", err.Error()))))
+		}
+		if cmds != nil {
+			return tea.Batch(cmds...)()
+		}
+		return nil
+	}
 }
 
 // getSubFolders walks through the given BasePath and returns a list of directory entries which are also directories.