4. Update Update() function to handle generateMessages message and update model accordingly

{cocoide} · {cocoide} · commit e6741747c893 · 2023-09-03T01:15:00.000+09:00
diff --git a/cmd/suggest.go b/cmd/suggest.go
@@ -3,7 +3,6 @@ package cmd
 import (
 	"context"
 	"fmt"
-	"log"
 	"strings"
 
 	tea "github.com/charmbracelet/bubbletea"
@@ -18,14 +17,40 @@ type model struct {
 	choices    []string
 	currentIdx int
 	errorMsg   string
+	isLoading  bool
+	messages   []string
+}
+
+type generateMessages struct {
+	messages []string
+	errorMsg string
 }
 
 func (m model) Init() tea.Cmd {
-	return nil
+	return func() tea.Msg {
+		util.LoadEnv()
+		ctx := context.Background()
+		og := gateway.NewOpenAIGateway(ctx)
+		ms := service.NewMessageService(og)
+		messages, err := ms.AsyncGenerateCommitMessage()
+		if err != nil {
+			return generateMessages{errorMsg: "メッセージの生成に失敗: " + err.Error()}
+		}
+		return generateMessages{messages: messages}
+	}
 }
 
 func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	switch msg := msg.(type) {
+	case generateMessages:
+		if msg.errorMsg != "" {
+			m.errorMsg = msg.errorMsg
+			m.isLoading = false
+			return m, nil
+		}
+		m.choices = msg.messages
+		m.isLoading = false
+		return m, nil
 	case tea.KeyMsg:
 		switch msg.Type {
 		case tea.KeyUp:
@@ -38,7 +63,7 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 			}
 		case tea.KeyEnter:
 			if err := util.ExecCommitMessage(m.choices[m.currentIdx]); err != nil {
-				m.errorMsg = "コミットエラーが発生"
+				m.errorMsg = "コミットに失敗: " + err.Error()
 				return m, tea.Quit
 			}
 			return m, tea.Quit
@@ -50,13 +75,20 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 }
 
 func (m model) View() string {
+	if m.errorMsg != "" {
+		red := color.New(color.FgRed).SprintFunc()
+		return fmt.Sprintf(red(m.errorMsg))
+	}
+	if m.isLoading {
+		return "🌎 Generating commit messages ..."
+	}
 	var b strings.Builder
 	if m.errorMsg != "" {
 		red := color.New(color.FgRed).SprintFunc()
 		b.WriteString(red(m.errorMsg) + "\n\n")
 	}
 	white := color.New(color.FgWhite).SprintFunc()
-	b.WriteString(white("Please select an option:"))
+	b.WriteString(white("🍕Please select an option:"))
 	b.WriteString(white("\n  Use arrow ↑↓ to navigate and press Enter to select.\n\n"))
 
 	for i, choice := range m.choices {
@@ -76,19 +108,7 @@ var suggestCmd = &cobra.Command{
 	Short:   "Suggestion of commit message for staging repository",
 	Aliases: []string{"s", "suggest"},
 	Run: func(cmd *cobra.Command, args []string) {
-		util.LoadEnv()
-		ctx := context.Background()
-		og := gateway.NewOpenAIGateway(ctx)
-		ms := service.NewMessageService(og)
-		messages, err := ms.AsyncGenerateCommitMessage()
-		if err != nil {
-			log.Fatal(err.Error())
-		}
-		var choices []string
-		for _, v := range messages {
-			choices = append(choices, v)
-		}
-		m := model{choices: choices}
+		m := model{isLoading: true}
 		p := tea.NewProgram(m)
 		p.Run()
 	},
diff --git a/internal/service/message.go b/internal/service/message.go
@@ -9,7 +9,7 @@ import (
 )
 
 const (
-	CommitMessagePrompt = "Generate commit messages for [%s]. Each message should be separated by only space"
+	CommitMessagePrompt = "Generate up to 5 commit messages for [%s]. Each message should be separated by only space"
 	FormatNotice        = ", format commit as:\n- feat: [feature description]\n- bugfix: [bugfix description]"
 )
 

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ import (`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`const (`
`12`		`- CommitMessagePrompt = "Generate commit messages for [%s]. Each message should be separated by only space"`
	`12`	`+ CommitMessagePrompt = "Generate up to 5 commit messages for [%s]. Each message should be separated by only space"`
`13`	`13`	`FormatNotice = ", format commit as:\n- feat: [feature description]\n- bugfix: [bugfix description]"`
`14`	`14`	`)`
`15`	`15`