refactor(ui): refactor all ui

refactor all ui

Signed-off-by: mritd <[email protected]>

Author: mritd

Makefile

@@ -16,7 +16,7 @@ install:
                						-X 'main.buildDate=${BUILD_DATE}' \
                						-X 'main.commitID=${COMMIT_SHA1}'"
 debug:
-	go install  -trimpath -gcflags "all=-N -l"
+	go install -trimpath -gcflags "all=-N -l"
 
 clean:
 	rm -rf dist

apps.go

@@ -2,9 +2,9 @@ package main
 
 import (
 	"fmt"
-	tea "github.com/charmbracelet/bubbletea"
 	"time"
 
+	tea "github.com/charmbracelet/bubbletea"
 	"github.com/urfave/cli/v2"
 )
 
@@ -53,8 +53,7 @@ func newBranchApp(ct string) *cli.App {
 				return cli.ShowAppHelp(c)
 			}
 
-			m := newResultModel()
-			m.message, m.err = createBranch(fmt.Sprintf("%s/%s", ct, c.Args().First()))
+			m := newBranchModel(fmt.Sprintf("%s/%s", ct, c.Args().First()))
 
 			return tea.NewProgram(&m).Start()
 		},
@@ -75,12 +74,12 @@ func commitApp() *cli.App {
 				return cli.ShowAppHelp(c)
 			}
 
-			m := model{
+			m := commitModel{
 				views: []tea.Model{
 					newSelectorModel(),
 					newInputsModel(),
-					newCommitModel(),
-					newResultModel(),
+					newCommittingModel(),
+					newErrorModel(),
 				},
 			}
 
@@ -121,8 +120,7 @@ func pushApp() *cli.App {
 				return cli.ShowAppHelp(c)
 			}
 
-			m := newResultModel()
-			m.message, m.err = push()
+			m := newPushModel()
 
 			return tea.NewProgram(&m).Start()
 		},

git_wapper.go

@@ -20,19 +20,31 @@ func createBranch(name string) (string, error) {
 	return git("checkout", "-b", name)
 }
 
-func hasStagedFiles() error {
-	msg, err := git("diff", "--cached", "--name-only")
+func commit(msg commitMsg) error {
+	if err := hasStagedFiles(); err != nil {
+		return err
+	}
+
+	f, err := ioutil.TempFile("", "gitflow-commit")
 	if err != nil {
 		return err
 	}
-	if msg == "" {
-		return errors.New("There is no file to commit, please execute the `git add` command to add the commit file.")
+	defer func() {
+		_ = f.Close()
+		_ = os.Remove(f.Name())
+	}()
+
+	_, err = fmt.Fprintf(f, "%s(%s): %s\n\n%s\n\n%s\n\n%s\n", msg.Type, msg.Scope, msg.Subject, msg.Body, msg.Footer, msg.SOB)
+	if err != nil {
+		return err
 	}
-	return nil
-}
 
-func currentBranch() (string, error) {
-	return git("symbolic-ref", "--short", "HEAD")
+	_, err = git("commit", "-F", f.Name())
+	if err != nil {
+		return err
+	}
+
+	return nil
 }
 
 func push() (string, error) {
@@ -53,47 +65,31 @@ func push() (string, error) {
 	return msg, err
 }
 
-func commitMessageCheck(f string) error {
-	reg := regexp.MustCompile(commitMessageCheckPattern)
-	bs, err := ioutil.ReadFile(f)
+func hasStagedFiles() error {
+	msg, err := git("diff", "--cached", "--name-only")
 	if err != nil {
 		return err
 	}
-
-	msgs := reg.FindStringSubmatch(string(bs))
-	if len(msgs) != 4 {
-		return fmt.Errorf(commitMessageCheckFailedMsg)
+	if msg == "" {
+		return errors.New("There is no file to commit, please execute the `git add` command to add the commit file.")
 	}
-
 	return nil
 }
 
-func commit(msg commitMsg) error {
-	if err := hasStagedFiles(); err != nil {
-		return err
-	}
-
-	if msg.Body == "" {
-		msg.Body = msg.Subject
-	}
-
-	f, err := ioutil.TempFile("", "gitflow-commit")
-	if err != nil {
-		return err
-	}
-	defer func() {
-		_ = f.Close()
-		_ = os.Remove(f.Name())
-	}()
+func currentBranch() (string, error) {
+	return git("symbolic-ref", "--short", "HEAD")
+}
 
-	_, err = fmt.Fprintf(f, "%s(%s): %s\n\n%s\n\n%s\n\n%s\n", msg.Type, msg.Scope, msg.Subject, msg.Body, msg.Footer, msg.SOB)
+func commitMessageCheck(f string) error {
+	reg := regexp.MustCompile(commitMessageCheckPattern)
+	bs, err := ioutil.ReadFile(f)
 	if err != nil {
 		return err
 	}
 
-	_, err = git("commit", "-F", f.Name())
-	if err != nil {
-		return err
+	msgs := reg.FindStringSubmatch(string(bs))
+	if len(msgs) != 4 {
+		return fmt.Errorf(commitMessageCheckFailedMsg)
 	}
 
 	return nil

ui/multi_task.go

@@ -35,21 +35,21 @@ var (
 		Spinner: spinner.Spinner{
 			Frames: []string{
 				"[     ]",
-				"[=    ]",
-				"[==   ]",
-				"[===  ]",
-				"[ === ]",
-				"[  ===]",
-				"[   ==]",
-				"[    =]",
+				"[≡    ]",
+				"[≡≡   ]",
+				"[≡≡≡  ]",
+				"[ ≡≡≡ ]",
+				"[  ≡≡≡]",
+				"[   ≡≡]",
+				"[    ≡]",
 				"[     ]",
-				"[    =]",
-				"[   ==]",
-				"[  ===]",
-				"[ === ]",
-				"[===  ]",
-				"[==   ]",
-				"[=    ]",
+				"[    ≡]",
+				"[   ≡≡]",
+				"[  ≡≡≡]",
+				"[ ≡≡≡ ]",
+				"[≡≡≡  ]",
+				"[≡≡   ]",
+				"[≡    ]",
 				"[     ]",
 			},
 			FPS: time.Second / 10,
@@ -89,7 +89,7 @@ func NewMultiTaskModelWithTasks(tasks []Task) MultiTaskModel {
 	return MultiTaskModel{
 		Tasks:           tasks,
 		Spinner:         MultiTaskSpinner,
-		TaskDelay:       300 * time.Millisecond,
+		TaskDelay:       200 * time.Millisecond,
 		LayoutStyle:     MultiTaskLayoutStyle,
 		BorderStyle:     MultiTaskBorderStyle,
 		MsgSuccessStyle: MultiTaskMsgSuccessStyle,

ui.go renamed to ui_commit.go

@@ -9,12 +9,13 @@ import (
 const (
 	SELECTOR = iota
 	INPUTS
-	SPINNER
-	RESULT
+	COMMIT
+	ERROR
 )
 
 type done struct {
-	err error
+	nextView int
+	err      error
 }
 
 type commitMsg struct {
@@ -26,50 +27,44 @@ type commitMsg struct {
 	SOB     string
 }
 
-type model struct {
+type commitModel struct {
 	err       error
 	views     []tea.Model
 	viewIndex int
 }
 
-func (m model) Init() tea.Cmd {
+func (m commitModel) Init() tea.Cmd {
 	return func() tea.Msg {
 		err := repoCheck()
 		if err != nil {
-			return done{err: err}
+			return done{nextView: ERROR, err: err}
 		}
 
 		err = hasStagedFiles()
 		if err != nil {
-			return done{err: err}
+			return done{nextView: ERROR, err: err}
 		}
 
 		return nil
 	}
 }
 
-func (m *model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
+func (m *commitModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	switch msg.(type) {
 	case done: // If the view returns a done message, it means that the stage has been processed
 		m.err = msg.(done).err
-		// If there is error in msg, immediately display an error message and exit
-		if m.err != nil {
-			m.viewIndex = RESULT
-		} else {
-			// Call the next view
-			m.viewIndex++
-		}
+		m.viewIndex = msg.(done).nextView
 
 		// some special views need to determine the state of the data to update
 		switch m.viewIndex {
 		case INPUTS:
 			return m, m.inputs
-		case SPINNER:
+		case COMMIT:
 			return m, m.commit
-		case RESULT:
-			return m, m.result
+		case ERROR:
+			return m, m.showErr
 		default:
-			return m, nil
+			return m, tea.Quit
 		}
 	default: // By default, the cmd returned by the view needs to be processed by itself
 		var cmd tea.Cmd
@@ -78,45 +73,47 @@ func (m *model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	}
 }
 
-func (m model) View() string {
+func (m commitModel) View() string {
 	return m.views[m.viewIndex].View()
 }
 
-func (m model) inputs() tea.Msg {
+func (m commitModel) inputs() tea.Msg {
 	return strings.ToUpper(m.views[SELECTOR].(selectorModel).choice)
 }
 
-func (m model) commit() tea.Msg {
+func (m commitModel) commit() tea.Msg {
 	sob, err := createSOB()
 	if err != nil {
 		return done{err: err}
 	}
 
-	return commitMsg{
+	msg := commitMsg{
 		Type:    m.views[SELECTOR].(selectorModel).choice,
 		Scope:   m.views[INPUTS].(inputsModel).inputs[0].Value(),
 		Subject: m.views[INPUTS].(inputsModel).inputs[1].Value(),
 		Body:    m.views[INPUTS].(inputsModel).inputs[2].Value(),
 		Footer:  m.views[INPUTS].(inputsModel).inputs[3].Value(),
 		SOB:     sob,
 	}
-}
 
-func (m model) result() tea.Msg {
-	if m.err != nil {
-		return m.err
-	} else {
-		return successMsg
+	if msg.Body == "" {
+		msg.Body = msg.Subject
 	}
+
+	return msg
+}
+
+func (m commitModel) showErr() tea.Msg {
+	return m.err
 }
 
 //func main() {
-//	m := model{
+//	m := commitModel{
 //		views: []tea.Model{
 //			newSelectorModel(),
 //			newInputsModel(),
 //			newCommitModel(),
-//			newResultModel(),
+//			newErrorModel(),
 //		},
 //	}
 //	if err := tea.NewProgram(&m).Start(); err != nil {