Skip to content

Commit 21cfb42

Browse files
authored
Merge pull request #8 from thetnaingtn/refresh-command
Separate out refresh cmd as standalone command
2 parents 32a07ff + 77c6c4c commit 21cfb42

File tree

3 files changed

+12
-3
lines changed

3 files changed

+12
-3
lines changed

ui/app.go

+6-3
Original file line numberDiff line numberDiff line change
@@ -76,16 +76,19 @@ func (m AppModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
7676
log.Println("tea.WindowSizeMsg")
7777
top, right, bottom, left := listStyle.GetMargin()
7878
m.list.SetSize(msg.Width-left-right, msg.Height-top-bottom)
79+
case refreshReposListMsg:
80+
log.Println("refreshReposListCmd")
81+
m.list.Title = "🍀 Refreshing forks"
82+
cmds = append(cmds, m.list.StartSpinner(), getReposCmd(m.client))
7983
case getReposListMsg:
8084
log.Println("getReposListCmd")
8185
m.list.Title = "Getting forks. Hold tight!"
82-
m.list.SetItems([]list.Item{}) // reset to empty list!!
8386
m.list.SetShowStatusBar(false)
8487
m.list.SetShowHelp(false)
8588
cmds = append(cmds, m.list.StartSpinner(), getReposCmd(m.client))
8689
case gotReposListMsg:
8790
log.Println("gotReposListCmd")
88-
m.list.Title = "Forks are up to date 🤗. No repository to sync!"
91+
m.list.Title = "All forks are up to date 🤗"
8992
if len(msg.repos) > 0 {
9093
m.list.Title = fmt.Sprintf("🤔 These fork%s require synchronization", mayBePlural(len(msg.repos)))
9194
}
@@ -131,7 +134,7 @@ func (m AppModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
131134
}
132135

133136
if key.Matches(msg, keyRefresh) {
134-
cmds = append(cmds, m.list.StartSpinner(), enqueuegetReposListCmd)
137+
cmds = append(cmds, m.list.StartSpinner(), refreshReposListCmd)
135138
}
136139
}
137140

ui/commands.go

+4
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ func enqueuegetReposListCmd() tea.Msg {
1414
return getReposListMsg{}
1515
}
1616

17+
func refreshReposListCmd() tea.Msg {
18+
return refreshReposListMsg{}
19+
}
20+
1721
func requestMergeReposCmd() tea.Msg {
1822
return mergeSelectedReposMsg{}
1923
}

ui/messages.go

+2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ func (e errorMsg) Error() string {
1313
return e.error.Error()
1414
}
1515

16+
type refreshReposListMsg struct{}
17+
1618
type getReposListMsg struct{}
1719
type gotReposListMsg struct {
1820
repos []*forky.RepositoryWithDetails

0 commit comments

Comments
 (0)