add exit mechanicm to each stage
remove types and moved struct to appropriate files
This commit is contained in:
@@ -1,11 +1,13 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"github.com/LazyBachelor/LazyPM/internal/style"
|
||||
"errors"
|
||||
|
||||
tea "github.com/charmbracelet/bubbletea"
|
||||
"github.com/charmbracelet/huh"
|
||||
)
|
||||
|
||||
var ErrUserQuit = errors.New("user quit")
|
||||
|
||||
const (
|
||||
IntroTitle = "Welcome to the Task Survey!"
|
||||
|
||||
@@ -21,54 +23,60 @@ By participating, you consent to the collection and use of your data as describe
|
||||
)
|
||||
|
||||
type introModel struct {
|
||||
form *huh.Form
|
||||
stage int
|
||||
width, height int
|
||||
userQuit bool
|
||||
}
|
||||
|
||||
func newIntroModel() introModel {
|
||||
return introModel{
|
||||
form: huh.NewForm(
|
||||
huh.NewGroup(
|
||||
huh.NewNote().Title(IntroTitle).Description(IntroductionText),
|
||||
),
|
||||
huh.NewGroup(
|
||||
huh.NewNote().Title("Disclaimer").Description(Disclaimer),
|
||||
),
|
||||
),
|
||||
stage: 0,
|
||||
}
|
||||
}
|
||||
|
||||
func (m introModel) Init() tea.Cmd {
|
||||
m.form.Init()
|
||||
return nil
|
||||
}
|
||||
|
||||
func (m introModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
|
||||
switch msg := msg.(type) {
|
||||
case tea.KeyMsg:
|
||||
switch msg.Type {
|
||||
case tea.KeyEsc, tea.KeyCtrlC:
|
||||
return m, tea.Quit
|
||||
}
|
||||
case tea.WindowSizeMsg:
|
||||
m.SetSize(msg.Width, msg.Height)
|
||||
case tea.KeyMsg:
|
||||
switch msg.Type {
|
||||
case tea.KeyEnter, tea.KeySpace:
|
||||
m.stage++
|
||||
if m.stage > 1 {
|
||||
return m, tea.Quit
|
||||
}
|
||||
case tea.KeyEsc, tea.KeyCtrlC:
|
||||
m.userQuit = true
|
||||
return m, tea.Quit
|
||||
}
|
||||
}
|
||||
|
||||
form, cmd := m.form.Update(msg)
|
||||
if f, ok := form.(*huh.Form); ok {
|
||||
m.form = f
|
||||
}
|
||||
|
||||
return m, cmd
|
||||
return m, nil
|
||||
}
|
||||
|
||||
func (m introModel) View() string {
|
||||
return m.form.WithTheme(style.HuhCenterTheme()).View()
|
||||
switch m.stage {
|
||||
case 0:
|
||||
return IntroductionText
|
||||
case 1:
|
||||
return Disclaimer
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
func (m introModel) Run() error {
|
||||
_, err := tea.NewProgram(m, tea.WithAltScreen()).Run()
|
||||
return err
|
||||
model, err := tea.NewProgram(m, tea.WithAltScreen()).Run()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if m, ok := model.(introModel); ok && m.userQuit {
|
||||
return ErrUserQuit
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (m *introModel) SetSize(width, height int) {
|
||||
|
||||
@@ -2,9 +2,11 @@ package main
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"fmt"
|
||||
"log"
|
||||
"math/rand"
|
||||
"os"
|
||||
|
||||
"github.com/LazyBachelor/LazyPM/internal/service"
|
||||
"github.com/LazyBachelor/LazyPM/pkg/task"
|
||||
@@ -14,6 +16,9 @@ func main() {
|
||||
ctx := context.Background()
|
||||
|
||||
if err := newIntroModel().Run(); err != nil {
|
||||
if errors.Is(err, ErrUserQuit) {
|
||||
os.Exit(0)
|
||||
}
|
||||
log.Fatalf("Failed to run intro screen: %v\n", err)
|
||||
}
|
||||
|
||||
@@ -27,6 +32,9 @@ func main() {
|
||||
interfaces := initInterfaces()
|
||||
|
||||
if err := taskLoop(ctx, svc, surveyTasks, interfaces); err != nil {
|
||||
if errors.Is(err, task.ErrUserQuit) {
|
||||
os.Exit(0)
|
||||
}
|
||||
log.Fatalf("Task loop failed: %v\n", err)
|
||||
}
|
||||
}
|
||||
@@ -34,23 +42,26 @@ func main() {
|
||||
func taskLoop(ctx context.Context, svc *service.Services, surveyTasks []*task.Task, interfaces []task.Interface) error {
|
||||
interfaceIndex := rand.Int() % len(interfaces)
|
||||
|
||||
for _, task := range surveyTasks {
|
||||
for _, t := range surveyTasks {
|
||||
|
||||
task.SetInterface(interfaces[interfaceIndex])
|
||||
t.SetInterface(interfaces[interfaceIndex])
|
||||
|
||||
if err := task.Initialize(ctx, svc); err != nil {
|
||||
if err := t.Initialize(ctx, svc); err != nil {
|
||||
return fmt.Errorf("failed to initialize task: %w", err)
|
||||
}
|
||||
|
||||
if err := task.IntroduceTask(); err != nil {
|
||||
if err := t.IntroduceTask(); err != nil {
|
||||
if errors.Is(err, task.ErrUserQuit) {
|
||||
return task.ErrUserQuit
|
||||
}
|
||||
return fmt.Errorf("failed to display task introduction screen: %w", err)
|
||||
}
|
||||
|
||||
if err := task.StartInterface(ctx, task.Config); err != nil {
|
||||
if err := t.StartInterface(ctx, t.Config); err != nil {
|
||||
return fmt.Errorf("failed to start task interface: %w", err)
|
||||
}
|
||||
|
||||
ok, err := task.Validate(ctx, svc)
|
||||
ok, err := t.Validate(ctx, svc)
|
||||
if err != nil {
|
||||
return fmt.Errorf("validation error: %w", err)
|
||||
}
|
||||
@@ -58,7 +69,10 @@ func taskLoop(ctx context.Context, svc *service.Services, surveyTasks []*task.Ta
|
||||
return fmt.Errorf("task validation failed: task did not meet requirements")
|
||||
}
|
||||
|
||||
if err := task.StartQuestionnaire(); err != nil {
|
||||
if err := t.StartQuestionnaire(); err != nil {
|
||||
if errors.Is(err, task.ErrUserQuit) {
|
||||
return task.ErrUserQuit
|
||||
}
|
||||
return fmt.Errorf("failed to start questionnaire: %w", err)
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user