From 1282da4e0ed13e58b062373624bc960722641ee5 Mon Sep 17 00:00:00 2001
From: onyx-and-iris <code@onyxandiris.online>
Date: Mon, 3 Aug 2026 04:46:00 +0100
Subject: [PATCH] Fail fast if count value is invalid when count-prompt is not
 set.

move lottery draw logic into runLottery()

move MarkFlagsMutuallyExclusive into init()
---
 cmd/lottery/main.go     | 102 +++++++++++++++++++++++-----------------
 cmd/lottery/validate.go |  41 ++++++++++++++++
 2 files changed, 101 insertions(+), 42 deletions(-)
 create mode 100644 cmd/lottery/validate.go

diff --git a/cmd/lottery/main.go b/cmd/lottery/main.go
index 325151f..5a46786 100644
--- a/cmd/lottery/main.go
+++ b/cmd/lottery/main.go
@@ -33,23 +33,16 @@ var rootCmd = &cobra.Command{
 	Use:   "lottery",
 	Short: "A CLI for National Lottery games.",
 	PreRunE: func(cmd *cobra.Command, args []string) error {
-		cmd.MarkFlagsMutuallyExclusive("count", "count-prompt")
-
-		return nil
+		// Fail fast if the count is invalid when the count-prompt flag is not set.
+		return validateNonPromptCount()
 	},
 	RunE: func(cmd *cobra.Command, args []string) error {
 		kindStr := viper.GetString("kind")
 		if kindStr == "" {
-			form := huh.NewForm(
-				huh.NewGroup(
-					huh.NewSelect[string]().
-						Title("Pick a lottery.").
-						Options(kindPromptOptions()...).
-						Value(&kindStr),
-				),
-			)
-			err := form.Run()
-			if err != nil {
+			if err := huh.NewSelect[string]().
+				Title("Pick a lottery.").
+				Options(kindPromptOptions()...).
+				Value(&kindStr).Run(); err != nil {
 				return err
 			}
 		}
@@ -59,42 +52,65 @@ var rootCmd = &cobra.Command{
 			return err
 		}
 
-		l, err := lottery.New(kind)
+		count, err := resolveCount()
 		if err != nil {
 			return err
 		}
 
-		if countPrompt := viper.GetBool("count-prompt"); countPrompt {
-			var count string
-			if err := huh.NewInput().
-				Title("How many draws would you like to generate?").
-				Value(&count).Run(); err != nil {
-				return err
-			}
-
-			viper.Set("count", count)
-		}
-
-		count := viper.GetInt("count")
-		includeDrawHeading := count > 1
-		renders := make([]string, 0, count)
-		drawTitle := "Lottery"
-
-		for i := range count {
-			l.Draw()
-			title, entry := renderDrawEntry(l, i+1, includeDrawHeading)
-			drawTitle = title
-			renders = append(renders, entry)
-		}
-
-		if len(renders) > 0 {
-			fmt.Println(renderDrawCollection(drawTitle, renders))
-		}
-
-		return nil
+		return runLottery(kind, count)
 	},
 }
 
+// resolveCount resolves the count of draws to generate, either from the command line flag or by prompting the user.
+func resolveCount() (int, error) {
+	if viper.GetBool("count-prompt") {
+		var count int
+		if err := huh.NewInput().
+			Title("How many draws would you like to generate?").
+			Validate(func(s string) error {
+				parsedCount, err := parseCount(s)
+				if err != nil {
+					return err
+				}
+				count = parsedCount
+				return nil
+			}).
+			Run(); err != nil {
+			return 0, err
+		}
+
+		return count, nil
+	}
+
+	return viper.GetInt("count"), nil
+}
+
+// runLottery runs the lottery draw for the specified kind and count.
+func runLottery(kind lottery.Kind, count int) error {
+	selectedLottery, err := lottery.New(kind)
+	if err != nil {
+		return err
+	}
+
+	includeDrawHeading := count > 1
+	renders := make([]string, 0, count)
+	drawTitle := "Lottery"
+
+	for i := range count {
+		selectedLottery.Draw()
+		title, entry := renderDrawEntry(selectedLottery, i+1, includeDrawHeading)
+		drawTitle = title
+		renders = append(renders, entry)
+	}
+
+	if len(renders) > 0 {
+		fmt.Println(renderDrawCollection(drawTitle, renders))
+	}
+
+	return nil
+}
+
+// kindPromptLabel returns a user-friendly label for the given lottery kind.
 func kindPromptLabel(kind lottery.Kind) string {
 	switch kind {
 	case lottery.KindLotto:
@@ -112,6 +128,7 @@ func kindPromptLabel(kind lottery.Kind) string {
 	}
 }
 
+// kindPromptOptions returns a slice of options for the lottery kind prompt.
 func kindPromptOptions() []huh.Option[string] {
 	kinds := lottery.AllKinds()
 	options := make([]huh.Option[string], 0, len(kinds))
@@ -125,6 +142,7 @@ func init() {
 	rootCmd.Flags().StringP("kind", "k", "", "Lottery kind to generate draws for.")
 	rootCmd.Flags().IntP("count", "c", 1, "Number of draws to generate.")
 	rootCmd.Flags().BoolP("count-prompt", "C", false, "Prompt for the number of draws to generate.")
+	rootCmd.MarkFlagsMutuallyExclusive("count", "count-prompt")
 
 	viper.SetEnvKeyReplacer(strings.NewReplacer("-", "_"))
 	viper.SetEnvPrefix("LOTTERY")
diff --git a/cmd/lottery/validate.go b/cmd/lottery/validate.go
new file mode 100644
index 0000000..dda22a9
--- /dev/null
+++ b/cmd/lottery/validate.go
@@ -0,0 +1,41 @@
+package main
+
+import (
+	"fmt"
+	"strconv"
+	"strings"
+
+	"github.com/spf13/viper"
+)
+
+// validateNonPromptCount checks if the count is valid when the count-prompt flag is not set.
+func validateNonPromptCount() error {
+	if viper.GetBool("count-prompt") {
+		return nil
+	}
+
+	return validateCount(viper.GetInt("count"))
+}
+
+// validateCount checks if the count is valid.
+func validateCount(count int) error {
+	if count < 1 {
+		return fmt.Errorf("count must be greater than 0")
+	}
+
+	return nil
+}
+
+// parseCount parses the count from a string and validates it.
+func parseCount(raw string) (int, error) {
+	count, err := strconv.Atoi(strings.TrimSpace(raw))
+	if err != nil {
+		return 0, fmt.Errorf("count must be a whole number")
+	}
+
+	if err := validateCount(count); err != nil {
+		return 0, err
+	}
+
+	return count, nil
+}