feat: support custom text input via string or file path

Author: yannick2009

cmd/main.go

@@ -2,6 +2,7 @@ package cmd
 
 import (
 	"fmt"
+	"os"
 	"path/filepath"
 	"strings"
 
@@ -16,6 +17,8 @@ var (
 	themeName  string // Theme name or path to custom theme file
 	listThemes bool   // List available themes and exit
 	debugMode  bool   // Enable debug mode for performance analysis
+	customText string // Custom text to display in the game
+	filePath   string // Custom text file to read from
 )
 
 var startCmd = &cobra.Command{
@@ -62,14 +65,24 @@ var startCmd = &cobra.Command{
 			}
 		}
 
+		// check for custom text and set it
+		if filePath != "" {
+			data, err := os.ReadFile(filePath)
+			if err != nil {
+				cmd.Printf("Warning: Could not read custom text file '%s': %v\n", filePath, err)
+			} else {
+				customText = string(data)
+			}
+		}
+
 		// check for cursor type and set it
 		if cursorType != "" {
 			ui.CurrentSettings.CursorType = cursorType
 		}
 
 		// apply settings and start loading
 		ui.ApplySettings()
-		ui.StartLoadingWithOptions(ui.CurrentSettings.CursorType)
+		ui.StartLoadingWithOptions(ui.CurrentSettings.CursorType, customText)
 	},
 }
 
@@ -83,6 +96,10 @@ func init() {
 	startCmd.Flags().BoolP("verbose", "v", false, "Enable verbose output")
 	startCmd.Flags().BoolVar(&debugMode, "debug", false, "Enable debug mode for performance analysis")
 
+	// Custom text option
+	startCmd.Flags().StringVarP(&customText, "text", "x", "", "Custom text to display in the game (default: random text)")
+	startCmd.Flags().StringVarP(&filePath, "file", "f", "", "Custom text file to read from")
+
 	// Add command to root
 	rootCmd.AddCommand(startCmd)
 }

ui/endgame.go

@@ -71,7 +71,7 @@ func (m *EndGameModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 			case 0:
 				return NewTypingModel(m.width, m.height, m.text), InitGlobalTick()
 			case 1:
-				StartLoadingWithOptions(CurrentSettings.CursorType)
+				StartLoadingWithOptions(CurrentSettings.CursorType, m.text)
 				return m, tea.Quit
 			}
 

ui/game.go

@@ -219,5 +219,5 @@ func RunTypingGame() {
 		CurrentSettings.ThemeName, CurrentSettings.CursorType,
 		CurrentSettings.GameMode, CurrentSettings.UseNumbers)
 
-	StartLoadingWithOptions(CurrentSettings.CursorType)
+	StartLoadingWithOptions(CurrentSettings.CursorType, "")
 }

ui/loading.go

@@ -10,6 +10,7 @@ import (
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/lipgloss"
 	devlog "github.com/prime-run/go-typer/log"
+	"github.com/prime-run/go-typer/utils"
 	"github.com/spf13/cobra"
 )
 
@@ -25,7 +26,7 @@ type LoadingModel struct {
 	progressBar progress.Model
 }
 
-func NewLoadingModel() *LoadingModel {
+func NewLoadingModel(customText string) *LoadingModel {
 	p := progress.New(
 		progress.WithDefaultGradient(),
 		progress.WithWidth(60),
@@ -37,13 +38,14 @@ func NewLoadingModel() *LoadingModel {
 		progress:    0.0,
 		lastTick:    time.Now(),
 		progressBar: p,
+		text:        customText,
 	}
 }
 
 func (m *LoadingModel) Init() tea.Cmd {
 	return tea.Batch(
 		InitGlobalTick(),
-		fetchTextCmd(),
+		fetchTextCmd(m.text),
 	)
 }
 
@@ -96,7 +98,19 @@ func (m *LoadingModel) View() string {
 		content)
 }
 
-func fetchTextCmd() tea.Cmd {
+// fetchTextCmd fetches random text based on the current settings or uses a custom text if provided.
+func fetchTextCmd(customText string) tea.Cmd {
+	// If a custom text is provided, use it directly
+	if customText != "" {
+		return func() tea.Msg {
+			if len(customText) > 300 {
+				customText = utils.FormatText(customText[:300]) // Limit to 300 characters
+			}
+			return textFetchedMsg(customText)
+		}
+	}
+
+	// Otherwise, fetch random text based on the current settings
 	return func() tea.Msg {
 		textCount := map[string]int{
 			TextLengthShort:    1,
@@ -111,7 +125,7 @@ func fetchTextCmd() tea.Cmd {
 
 		estimatedTotalLen := count * 200
 
-		for i := 0; i < count; i++ {
+		for range count {
 			text := GetRandomText()
 			texts = append(texts, text)
 		}
@@ -131,18 +145,18 @@ func fetchTextCmd() tea.Cmd {
 }
 
 func StartLoading(cmd *cobra.Command, args []string) {
-	StartLoadingWithOptions("block")
+	StartLoadingWithOptions("block", "")
 }
 
-func StartLoadingWithOptions(cursorTypeStr string) {
+func StartLoadingWithOptions(cursorTypeStr string, customText string) {
 	selectedCursorType := BlockCursor
 	if cursorTypeStr == "underline" {
 		selectedCursorType = UnderlineCursor
 	}
 
 	DefaultCursorType = selectedCursorType
 
-	model := NewLoadingModel()
+	model := NewLoadingModel(customText)
 	p := tea.NewProgram(model, tea.WithAltScreen())
 	if _, err := p.Run(); err != nil {
 		fmt.Println("Oh no!", err)

ui/startscreen.go

@@ -773,7 +773,7 @@ func RunStartScreen() {
 			item := m.mainMenuItems[m.selectedItem]
 
 			if item.title == "Start Typing" {
-				StartLoadingWithOptions(m.cursorType)
+				StartLoadingWithOptions(m.cursorType, "")
 			}
 		}
 	}