From 612f0c86c73c8574ee8ae8aca495183a7734ae0f Mon Sep 17 00:00:00 2001 From: Robin Olsen Date: Wed, 18 Feb 2026 15:32:08 +0100 Subject: [PATCH] refactor for simplicity --- cmd/survey/init.go | 38 ++++++++++++++++++++++++-------------- cmd/survey/runner.go | 19 +++++++++++++++++-- cmd/survey/tasks/tasks.go | 32 -------------------------------- 3 files changed, 41 insertions(+), 48 deletions(-) delete mode 100644 cmd/survey/tasks/tasks.go diff --git a/cmd/survey/init.go b/cmd/survey/init.go index df27125..78c64c7 100644 --- a/cmd/survey/init.go +++ b/cmd/survey/init.go @@ -9,9 +9,33 @@ import ( "github.com/LazyBachelor/LazyPM/pkg/tui" "github.com/LazyBachelor/LazyPM/pkg/web" + "github.com/LazyBachelor/LazyPM/cmd/survey/tasks" _ "github.com/LazyBachelor/LazyPM/cmd/survey/tasks" ) +func init() { + task.Register("create_issue", func(svc *service.Services) task.Tasker { + return tasks.NewCreateIssueTask(svc) + }) + task.Register("coding_task", func(svc *service.Services) task.Tasker { + return tasks.NewCodingTask(svc) + }) +} + +func initTasks(svc *service.Services) []task.Tasker { + var taskers []task.Tasker + + for _, name := range task.List() { + t, err := task.Get(name, svc) + if err != nil { + continue + } + taskers = append(taskers, t) + } + + return taskers +} + func initializeServices(ctx context.Context) (*service.Services, func(), error) { config := service.Config{ IssuePrefix: "pm", @@ -29,17 +53,3 @@ func initInterfaces() map[string]task.Interface { "web": web.NewWeb(), } } - -func initTasks(svc *service.Services) []task.Tasker { - var taskers []task.Tasker - - for _, name := range task.List() { - t, err := task.Get(name, svc) - if err != nil { - continue - } - taskers = append(taskers, t) - } - - return taskers -} diff --git a/cmd/survey/runner.go b/cmd/survey/runner.go index 3e213f1..15545d5 100644 --- a/cmd/survey/runner.go +++ b/cmd/survey/runner.go @@ -6,12 +6,14 @@ import ( "fmt" "math/rand" - "github.com/LazyBachelor/LazyPM/cmd/survey/tasks" + "github.com/LazyBachelor/LazyPM/pkg/cli/repl" "github.com/LazyBachelor/LazyPM/pkg/task" + "github.com/LazyBachelor/LazyPM/pkg/tui" + "github.com/LazyBachelor/LazyPM/pkg/web" ) func runTask(ctx context.Context, t task.Tasker, i task.Interface) error { - return task.RunTask(ctx, t, i, tasks.InterfaceToType(i)) + return task.RunTask(ctx, t, i, InterfaceToType(i)) } func taskLoop(ctx context.Context, surveyTasks []task.Tasker, interfaces map[string]task.Interface) error { @@ -35,6 +37,19 @@ func taskLoop(ctx context.Context, surveyTasks []task.Tasker, interfaces map[str return nil } +func InterfaceToType(it task.Interface) task.InterfaceType { + switch it.(type) { + case *repl.REPL: + return task.InterfaceCLI + case *tui.Tui: + return task.InterfaceTUI + case *web.Web: + return task.InterfaceWeb + default: + return task.InterfaceType("unknown") + } +} + func returnIfUserQuit(err error, msg string) error { if errors.Is(err, task.ErrUserQuit) { return nil diff --git a/cmd/survey/tasks/tasks.go b/cmd/survey/tasks/tasks.go deleted file mode 100644 index d8876b2..0000000 --- a/cmd/survey/tasks/tasks.go +++ /dev/null @@ -1,32 +0,0 @@ -package tasks - -import ( - "github.com/LazyBachelor/LazyPM/internal/service" - "github.com/LazyBachelor/LazyPM/pkg/cli/repl" - "github.com/LazyBachelor/LazyPM/pkg/task" - "github.com/LazyBachelor/LazyPM/pkg/tui" - "github.com/LazyBachelor/LazyPM/pkg/web" -) - -func init() { - task.Register("create_issue", func(svc *service.Services) task.Tasker { - return NewCreateIssueTask(svc) - }) - - task.Register("coding_task", func(svc *service.Services) task.Tasker { - return NewCodingTask(svc) - }) -} - -func InterfaceToType(it task.Interface) task.InterfaceType { - switch it.(type) { - case *repl.REPL: - return task.InterfaceCLI - case *tui.Tui: - return task.InterfaceTUI - case *web.Web: - return task.InterfaceWeb - default: - return task.InterfaceType("unknown") - } -}