use cobra for cli

delete pkg/runner and put funcs in task
add start command
This commit is contained in:
Robin Olsen
2026-02-17 10:24:15 +01:00
parent d5daa49b64
commit a38e32aa78
5 changed files with 101 additions and 73 deletions

48
cmd/survey/cmd.go Normal file
View File

@@ -0,0 +1,48 @@
package main
import (
"errors"
"log"
"os"
"github.com/LazyBachelor/LazyPM/pkg/task"
"github.com/spf13/cobra"
)
var rootCmd = &cobra.Command{
Use: "survey",
Short: "Run the user survey",
}
var startCmd = &cobra.Command{
Use: "start",
Short: "Start the user survey",
Run: func(cmd *cobra.Command, args []string) {
if err := newIntroModel().Run(); err != nil {
if errors.Is(err, ErrUserQuit) {
os.Exit(0)
}
log.Fatalf("Failed to run intro screen: %v\n", err)
}
svc, close, err := initializeServices(cmd.Context())
if err != nil {
log.Fatalf("Failed to initialize services: %v\n", err)
}
defer close()
surveyTasks := initTasks()
interfaces := initInterfaces()
if err := taskLoop(cmd.Context(), svc, surveyTasks, interfaces); err != nil {
if errors.Is(err, task.ErrUserQuit) {
os.Exit(0)
}
log.Fatalf("Task loop failed: %v\n", err)
}
},
}
func init() {
rootCmd.AddCommand(startCmd)
}

17
cmd/survey/main.go Normal file
View File

@@ -0,0 +1,17 @@
package main
import (
"context"
"log"
"github.com/charmbracelet/fang"
)
func main() {
ctx := context.Background()
if err := fang.Execute(ctx, rootCmd,
fang.WithColorSchemeFunc(fang.AnsiColorScheme)); err != nil {
log.Fatalf("Failed to execute command: %v\n", err)
}
}

View File

@@ -4,41 +4,12 @@ import (
"context"
"errors"
"fmt"
"log"
"math/rand"
"os"
"github.com/LazyBachelor/LazyPM/internal/service"
"github.com/LazyBachelor/LazyPM/pkg/task"
)
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)
}
svc, close, err := initializeServices(ctx)
if err != nil {
log.Fatalf("Failed to initialize services: %v\n", err)
}
defer close()
surveyTasks := initTasks()
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)
}
}
func taskLoop(ctx context.Context, svc *service.Services, surveyTasks []*task.Task, interfaces []task.Interface) error {
interfaceIndex := rand.Int() % len(interfaces)

View File

@@ -1,44 +0,0 @@
package task
import (
"context"
"fmt"
tea "github.com/charmbracelet/bubbletea"
)
func (t *Task) IntroduceTask() error {
if t.aboutScreen == nil {
return fmt.Errorf("aboutScreen is not set")
}
model, err := tea.NewProgram(t.aboutScreen, tea.WithAltScreen()).Run()
if err != nil {
return err
}
if m, ok := model.(interface{ GetUserQuit() bool }); ok && m.GetUserQuit() {
return ErrUserQuit
}
return nil
}
func (t *Task) StartInterface(ctx context.Context, cfg TaskConfig) error {
if t.interfaceType == nil {
return fmt.Errorf("interfaceType is not set")
}
return t.interfaceType.Run(ctx, cfg)
}
func (t *Task) StartQuestionnaire() error {
if t.questionnaire == nil {
return fmt.Errorf("questionnaire is not set")
}
model, err := tea.NewProgram(t.questionnaire, tea.WithAltScreen()).Run()
if err != nil {
return err
}
if m, ok := model.(interface{ GetUserQuit() bool }); ok && m.GetUserQuit() {
return ErrUserQuit
}
return nil
}

View File

@@ -25,6 +25,42 @@ func NewTask(aboutScreen tea.Model, questionnaire tea.Model) *Task {
}
}
func (t *Task) IntroduceTask() error {
if t.aboutScreen == nil {
return fmt.Errorf("aboutScreen is not set")
}
model, err := tea.NewProgram(t.aboutScreen, tea.WithAltScreen()).Run()
if err != nil {
return err
}
if m, ok := model.(interface{ GetUserQuit() bool }); ok && m.GetUserQuit() {
return ErrUserQuit
}
return nil
}
func (t *Task) StartInterface(ctx context.Context, cfg TaskConfig) error {
if t.interfaceType == nil {
return fmt.Errorf("interfaceType is not set")
}
return t.interfaceType.Run(ctx, cfg)
}
func (t *Task) StartQuestionnaire() error {
if t.questionnaire == nil {
return fmt.Errorf("questionnaire is not set")
}
model, err := tea.NewProgram(t.questionnaire, tea.WithAltScreen()).Run()
if err != nil {
return err
}
if m, ok := model.(interface{ GetUserQuit() bool }); ok && m.GetUserQuit() {
return ErrUserQuit
}
return nil
}
func (t *Task) SetConfigFunc(fn ConfigFunc) {
t.Config = fn()
}