diff --git a/cmd/survey/init.go b/cmd/survey/init.go index fc17c95..6c67f65 100644 --- a/cmd/survey/init.go +++ b/cmd/survey/init.go @@ -5,10 +5,7 @@ import ( "github.com/LazyBachelor/LazyPM/cmd/survey/tasks" "github.com/LazyBachelor/LazyPM/internal/service" - "github.com/LazyBachelor/LazyPM/pkg/repl" "github.com/LazyBachelor/LazyPM/pkg/task" - "github.com/LazyBachelor/LazyPM/pkg/tui" - "github.com/LazyBachelor/LazyPM/pkg/web" _ "github.com/LazyBachelor/LazyPM/cmd/survey/tasks" ) @@ -18,18 +15,21 @@ func initializeServices(ctx context.Context) (*service.App, func(), error) { } func initInterfaces() map[string]task.Interface { - return map[string]task.Interface{ - "repl": repl.NewRepl(), - "tui": tui.NewTui(), - "web": web.NewWeb(), + interfaces := make(map[string]task.Interface) + for _, name := range task.ListInterfaces() { + i, err := task.GetInterface(name) + if err != nil { + continue + } + interfaces[name] = i } + return interfaces } func initTasks(app *service.App) []task.Tasker { var taskList []task.Tasker - - for _, name := range task.List() { - t, err := task.Get(name, app) + for _, name := range task.ListTasks() { + t, err := task.GetTasks(name, app) if err != nil { continue } diff --git a/cmd/survey/main.go b/cmd/survey/main.go index 085b265..850a620 100644 --- a/cmd/survey/main.go +++ b/cmd/survey/main.go @@ -4,9 +4,12 @@ import ( "context" "github.com/LazyBachelor/LazyPM/cmd/survey/tasks" - "github.com/LazyBachelor/LazyPM/internal/commands/survey" + surveyCmd "github.com/LazyBachelor/LazyPM/internal/commands/survey" "github.com/LazyBachelor/LazyPM/internal/service" + "github.com/LazyBachelor/LazyPM/pkg/repl" "github.com/LazyBachelor/LazyPM/pkg/task" + "github.com/LazyBachelor/LazyPM/pkg/tui" + "github.com/LazyBachelor/LazyPM/pkg/web" "github.com/charmbracelet/fang" ) @@ -20,16 +23,22 @@ func main() { } func init() { + task.RegisterInterface("tui", tui.NewTui()) + task.RegisterInterface("web", web.NewWeb()) + task.RegisterInterface("repl", repl.NewRepl()) + surveyCmd.StartCmd.RunE = runStartCmd surveyCmd.RootCmd.AddCommand(surveyCmd.StartCmd) surveyCmd.RootCmd.AddCommand(surveyCmd.SubmitCmd) surveyCmd.RootCmd.AddCommand(surveyCmd.StatusCmd) - surveyCmd.RootCmd.AddCommand(surveyCmd.ListCmd) + surveyCmd.RootCmd.AddCommand(surveyCmd.ListTasksCmd) + surveyCmd.RootCmd.AddCommand(surveyCmd.ListInterfacesCmd) - task.Register("create_issue", func(app *service.App) task.Tasker { + task.RegisterTask("create_issue", func(app *service.App) task.Tasker { return tasks.NewCreateIssueTask(app) }) - task.Register("coding_task", func(app *service.App) task.Tasker { + task.RegisterTask("coding_task", func(app *service.App) task.Tasker { return tasks.NewCodingTask(app) }) + } diff --git a/cmd/survey/runner.go b/cmd/survey/runner.go index 6ff6ca0..3b8fd1b 100644 --- a/cmd/survey/runner.go +++ b/cmd/survey/runner.go @@ -25,7 +25,7 @@ func runStartCmd(cmd *cobra.Command, args []string) error { if cmd.Flags().Changed("interface") { if _, ok := interfaces[surveyCmd.InterfaceType]; !ok { - return fmt.Errorf("invalid interface, valid are (tui, repl, web)") + return fmt.Errorf("invalid interface, valid are %v", task.ListInterfaces()) } interfaces = map[string]task.Interface{ surveyCmd.InterfaceType: interfaces[surveyCmd.InterfaceType], diff --git a/internal/commands/survey/list.go b/internal/commands/survey/list.go index 6b4d6fa..80629a2 100644 --- a/internal/commands/survey/list.go +++ b/internal/commands/survey/list.go @@ -5,11 +5,24 @@ import ( "github.com/spf13/cobra" ) -var ListCmd = &cobra.Command{ - Use: "list", - Short: "List available tasks", +var ListTasksCmd = &cobra.Command{ + Use: "list-tasks", + Aliases: []string{"ls-t"}, + Short: "List available tasks", RunE: func(cmd *cobra.Command, args []string) error { - for i, name := range task.List() { + for i, name := range task.ListTasks() { + cmd.Printf("%d. %s\n", i+1, name) + } + return nil + }, +} + +var ListInterfacesCmd = &cobra.Command{ + Use: "list-interfaces", + Aliases: []string{"ls-i"}, + Short: "List available interfaces", + RunE: func(cmd *cobra.Command, args []string) error { + for i, name := range task.ListInterfaces() { cmd.Printf("%d. %s\n", i+1, name) } return nil diff --git a/pkg/task/register.go b/pkg/task/register.go index 4f57ae4..c98d75e 100644 --- a/pkg/task/register.go +++ b/pkg/task/register.go @@ -6,26 +6,51 @@ import ( "github.com/LazyBachelor/LazyPM/internal/service" ) -var registry = make(map[string]func(*service.App) Tasker) +var interfaceRegistry = make(map[string]Interface) -func Register(name string, constructor func(*service.App) Tasker) { - if _, exists := registry[name]; exists { - panic(fmt.Sprintf("task %q already registered", name)) +func RegisterInterface(name string, iface Interface) { + if _, exists := interfaceRegistry[name]; exists { + panic(fmt.Sprintf("interface %q already registered", name)) } - registry[name] = constructor + interfaceRegistry[name] = iface } -func Get(name string, app *service.App) (Tasker, error) { - constructor, ok := registry[name] +func GetInterface(name string) (Interface, error) { + iface, ok := interfaceRegistry[name] + if !ok { + return nil, fmt.Errorf("interface %q not found", name) + } + return iface, nil +} + +func ListInterfaces() []string { + names := make([]string, 0, len(interfaceRegistry)) + for name := range interfaceRegistry { + names = append(names, name) + } + return names +} + +var taskRegistry = make(map[string]func(*service.App) Tasker) + +func RegisterTask(name string, constructor func(*service.App) Tasker) { + if _, exists := taskRegistry[name]; exists { + panic(fmt.Sprintf("task %q already registered", name)) + } + taskRegistry[name] = constructor +} + +func GetTasks(name string, app *service.App) (Tasker, error) { + constructor, ok := taskRegistry[name] if !ok { return nil, fmt.Errorf("task %q not found", name) } return constructor(app), nil } -func List() []string { - names := make([]string, 0, len(registry)) - for name := range registry { +func ListTasks() []string { + names := make([]string, 0, len(taskRegistry)) + for name := range taskRegistry { names = append(names, name) } return names