cricinfo-cli-go 0.1.2 → 0.1.4

package/internal/cli/matches.go

@@ -13,12 +13,15 @@ type matchCommandService interface {
 	Close() error
 	List(ctx context.Context, opts cricinfo.MatchListOptions) (cricinfo.NormalizedResult, error)
 	Live(ctx context.Context, opts cricinfo.MatchListOptions) (cricinfo.NormalizedResult, error)
+	Lineups(ctx context.Context, query string, opts cricinfo.MatchLookupOptions) (cricinfo.NormalizedResult, error)
 	Show(ctx context.Context, query string, opts cricinfo.MatchLookupOptions) (cricinfo.NormalizedResult, error)
 	Status(ctx context.Context, query string, opts cricinfo.MatchLookupOptions) (cricinfo.NormalizedResult, error)
 	Scorecard(ctx context.Context, query string, opts cricinfo.MatchLookupOptions) (cricinfo.NormalizedResult, error)
 	Details(ctx context.Context, query string, opts cricinfo.MatchLookupOptions) (cricinfo.NormalizedResult, error)
 	Plays(ctx context.Context, query string, opts cricinfo.MatchLookupOptions) (cricinfo.NormalizedResult, error)
 	Situation(ctx context.Context, query string, opts cricinfo.MatchLookupOptions) (cricinfo.NormalizedResult, error)
+	LiveView(ctx context.Context, query string, opts cricinfo.MatchLookupOptions) (cricinfo.NormalizedResult, error)
+	Duel(ctx context.Context, query string, opts cricinfo.MatchDuelOptions) (cricinfo.NormalizedResult, error)
 	Phases(ctx context.Context, query string, opts cricinfo.MatchLookupOptions) (cricinfo.NormalizedResult, error)
 	Innings(ctx context.Context, query string, opts cricinfo.MatchInningsOptions) (cricinfo.NormalizedResult, error)
 	Partnerships(ctx context.Context, query string, opts cricinfo.MatchInningsOptions) (cricinfo.NormalizedResult, error)
@@ -30,6 +33,8 @@ type matchRuntimeOptions struct {
 	limit    int
 	leagueID string
 	team     string
+	batter   string
+	bowler   string
 	innings  int
 	period   int
 }
@@ -52,6 +57,7 @@ func newMatchesCommand(global *globalOptions) *cobra.Command {
 			"  cricinfo matches list",
 			"  cricinfo matches show <match>",
 			"  cricinfo matches status <match>",
+			"  cricinfo matches live-view <match>",
 			"  cricinfo matches scorecard <match>",
 			"  cricinfo matches innings <match>",
 		}, "\n"),
@@ -73,6 +79,7 @@ func newMatchesCommand(global *globalOptions) *cobra.Command {
 			"  cricinfo matches show <match>",
 			"  cricinfo matches status <match>",
 			"  cricinfo matches scorecard <match>",
+			"  cricinfo matches live-view <match>",
 			"  cricinfo matches innings <match>",
 		}, "\n"),
 		Args: cobra.NoArgs,
@@ -97,6 +104,7 @@ func newMatchesCommand(global *globalOptions) *cobra.Command {
 			"  cricinfo matches show <match>",
 			"  cricinfo matches status <match>",
 			"  cricinfo matches scorecard <match>",
+			"  cricinfo matches live-view <match>",
 			"  cricinfo matches innings <match>",
 		}, "\n"),
 		Args: cobra.NoArgs,
@@ -111,6 +119,26 @@ func newMatchesCommand(global *globalOptions) *cobra.Command {
 	}
 	liveCmd.Flags().IntVar(&opts.limit, "limit", 20, "Maximum number of live matches to return")
 
+	lineupCmd := &cobra.Command{
+		Use:   "lineup <match>",
+		Short: "Show starting lineups for both teams in one match",
+		Long: strings.Join([]string{
+			"Resolve one match and return the match-scoped roster entries for both teams.",
+			"",
+			"Next steps:",
+			"  cricinfo matches scorecard <match>",
+			"  cricinfo matches status <match>",
+			"  cricinfo matches deliveries <match> --team <team> --innings <n> --period <n>",
+		}, "\n"),
+		Args: cobra.MinimumNArgs(1),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			query := strings.TrimSpace(strings.Join(args, " "))
+			return runMatchCommand(cmd, global, func(ctx context.Context, service matchCommandService) (cricinfo.NormalizedResult, error) {
+				return service.Lineups(ctx, query, cricinfo.MatchLookupOptions{LeagueID: opts.leagueID})
+			})
+		},
+	}
+
 	showCmd := &cobra.Command{
 		Use:   "show <match>",
 		Short: "Show one match summary",
@@ -120,6 +148,7 @@ func newMatchesCommand(global *globalOptions) *cobra.Command {
 			"Next steps:",
 			"  cricinfo matches status <match>",
 			"  cricinfo matches scorecard <match>",
+			"  cricinfo matches live-view <match>",
 			"  cricinfo matches innings <match>",
 		}, "\n"),
 		Args: cobra.MinimumNArgs(1),
@@ -140,6 +169,7 @@ func newMatchesCommand(global *globalOptions) *cobra.Command {
 			"Next steps:",
 			"  cricinfo matches show <match>",
 			"  cricinfo matches scorecard <match>",
+			"  cricinfo matches live-view <match>",
 			"  cricinfo matches innings <match>",
 		}, "\n"),
 		Args: cobra.MinimumNArgs(1),
@@ -160,6 +190,7 @@ func newMatchesCommand(global *globalOptions) *cobra.Command {
 			"Next steps:",
 			"  cricinfo matches details <match>",
 			"  cricinfo matches plays <match>",
+			"  cricinfo matches live-view <match>",
 			"  cricinfo matches situation <match>",
 		}, "\n"),
 		Args: cobra.MinimumNArgs(1),
@@ -200,6 +231,7 @@ func newMatchesCommand(global *globalOptions) *cobra.Command {
 			"Next steps:",
 			"  cricinfo matches details <match>",
 			"  cricinfo matches scorecard <match>",
+			"  cricinfo matches live-view <match>",
 			"  cricinfo matches situation <match>",
 		}, "\n"),
 		Args: cobra.MinimumNArgs(1),
@@ -220,6 +252,7 @@ func newMatchesCommand(global *globalOptions) *cobra.Command {
 			"Next steps:",
 			"  cricinfo matches status <match>",
 			"  cricinfo matches details <match>",
+			"  cricinfo matches live-view <match>",
 			"  cricinfo matches scorecard <match>",
 		}, "\n"),
 		Args: cobra.MinimumNArgs(1),
@@ -231,6 +264,66 @@ func newMatchesCommand(global *globalOptions) *cobra.Command {
 		},
 	}
 
+	liveViewCmd := &cobra.Command{
+		Use:   "live-view <match>",
+		Short: "Show fan-first live snapshot (batters, bowlers, figures, recent balls)",
+		Long: strings.Join([]string{
+			"Resolve a match and render a synthesized live snapshot from delivery details and roster metadata.",
+			"",
+			"Shows:",
+			"  - current batters with runs/balls/strike-rate/boundaries",
+			"  - current bowlers with figures and economy",
+			"  - recent balls with over.ball and running score",
+			"",
+			"Next steps:",
+			"  cricinfo matches plays <match>",
+			"  cricinfo matches scorecard <match>",
+			"  cricinfo matches situation <match>",
+		}, "\n"),
+		Args: cobra.MinimumNArgs(1),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			query := strings.TrimSpace(strings.Join(args, " "))
+			return runMatchCommand(cmd, global, func(ctx context.Context, service matchCommandService) (cricinfo.NormalizedResult, error) {
+				return service.LiveView(ctx, query, cricinfo.MatchLookupOptions{LeagueID: opts.leagueID})
+			})
+		},
+	}
+
+	duelCmd := &cobra.Command{
+		Use:   "duel <match>",
+		Short: "Show batter-vs-bowler matchup summary in one match",
+		Long: strings.Join([]string{
+			"Resolve a match and summarize the head-to-head duel between one batter and one bowler.",
+			"",
+			"Required flags:",
+			"  --batter <player>",
+			"  --bowler <player>",
+			"",
+			"Next steps:",
+			"  cricinfo matches plays <match>",
+			"  cricinfo players deliveries <player> --match <match>",
+		}, "\n"),
+		Args: cobra.MinimumNArgs(1),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			if strings.TrimSpace(opts.batter) == "" {
+				return fmt.Errorf("--batter is required")
+			}
+			if strings.TrimSpace(opts.bowler) == "" {
+				return fmt.Errorf("--bowler is required")
+			}
+			query := strings.TrimSpace(strings.Join(args, " "))
+			return runMatchCommand(cmd, global, func(ctx context.Context, service matchCommandService) (cricinfo.NormalizedResult, error) {
+				return service.Duel(ctx, query, cricinfo.MatchDuelOptions{
+					LeagueID:    opts.leagueID,
+					BatterQuery: opts.batter,
+					BowlerQuery: opts.bowler,
+				})
+			})
+		},
+	}
+	duelCmd.Flags().StringVar(&opts.batter, "batter", "", "Required: batter ID/ref/alias")
+	duelCmd.Flags().StringVar(&opts.bowler, "bowler", "", "Required: bowler ID/ref/alias")
+
 	phasesCmd := &cobra.Command{
 		Use:   "phases <match>",
 		Short: "Show powerplay, middle, and death-over phase splits for each innings",
@@ -390,12 +483,15 @@ func newMatchesCommand(global *globalOptions) *cobra.Command {
 	cmd.AddCommand(
 		liveCmd,
 		listCmd,
+		lineupCmd,
 		showCmd,
 		statusCmd,
 		scorecardCmd,
 		detailsCmd,
 		playsCmd,
 		situationCmd,
+		liveViewCmd,
+		duelCmd,
 		phasesCmd,
 		inningsCmd,
 		partnershipsCmd,

package/internal/cli/matches_test.go

@@ -13,12 +13,15 @@ import (
 type fakeMatchService struct {
 	listResult      cricinfo.NormalizedResult
 	liveResult      cricinfo.NormalizedResult
+	lineupResult    cricinfo.NormalizedResult
 	showResult      cricinfo.NormalizedResult
 	statusResult    cricinfo.NormalizedResult
 	scorecardResult cricinfo.NormalizedResult
 	detailsResult   cricinfo.NormalizedResult
 	playsResult     cricinfo.NormalizedResult
 	situationResult cricinfo.NormalizedResult
+	liveViewResult  cricinfo.NormalizedResult
+	duelResult      cricinfo.NormalizedResult
 	phasesResult    cricinfo.NormalizedResult
 	inningsResult   cricinfo.NormalizedResult
 	partnerships    cricinfo.NormalizedResult
@@ -45,6 +48,10 @@ func (f *fakeMatchService) Live(context.Context, cricinfo.MatchListOptions) (cri
 	return f.liveResult, nil
 }
 
+func (f *fakeMatchService) Lineups(context.Context, string, cricinfo.MatchLookupOptions) (cricinfo.NormalizedResult, error) {
+	return f.lineupResult, nil
+}
+
 func (f *fakeMatchService) Show(context.Context, string, cricinfo.MatchLookupOptions) (cricinfo.NormalizedResult, error) {
 	return f.showResult, nil
 }
@@ -69,6 +76,14 @@ func (f *fakeMatchService) Situation(context.Context, string, cricinfo.MatchLook
 	return f.situationResult, nil
 }
 
+func (f *fakeMatchService) LiveView(context.Context, string, cricinfo.MatchLookupOptions) (cricinfo.NormalizedResult, error) {
+	return f.liveViewResult, nil
+}
+
+func (f *fakeMatchService) Duel(context.Context, string, cricinfo.MatchDuelOptions) (cricinfo.NormalizedResult, error) {
+	return f.duelResult, nil
+}
+
 func (f *fakeMatchService) Phases(context.Context, string, cricinfo.MatchLookupOptions) (cricinfo.NormalizedResult, error) {
 	return f.phasesResult, nil
 }
@@ -149,12 +164,39 @@ func TestMatchesCommandsRenderTextAndJSON(t *testing.T) {
 	service := &fakeMatchService{
 		listResult:      cricinfo.NewListResult(cricinfo.EntityMatch, []any{match}),
 		liveResult:      cricinfo.NewListResult(cricinfo.EntityMatch, []any{match}),
+		lineupResult:    cricinfo.NewListResult(cricinfo.EntityTeamRoster, []any{cricinfo.TeamRosterEntry{DisplayName: "Player One", TeamName: "BOOST"}}),
 		showResult:      cricinfo.NewDataResult(cricinfo.EntityMatch, match),
 		statusResult:    cricinfo.NewDataResult(cricinfo.EntityMatch, match),
 		scorecardResult: cricinfo.NewDataResult(cricinfo.EntityMatchScorecard, scorecard),
 		detailsResult:   cricinfo.NewListResult(cricinfo.EntityDeliveryEvent, []any{delivery}),
 		playsResult:     cricinfo.NewListResult(cricinfo.EntityDeliveryEvent, []any{delivery}),
 		situationResult: cricinfo.NewDataResult(cricinfo.EntityMatchSituation, situation),
+		liveViewResult: cricinfo.NewDataResult(cricinfo.EntityMatchSituation, cricinfo.MatchSituation{
+			MatchID: "1529474",
+			Live: &cricinfo.MatchLiveView{
+				Score: "69/2",
+				Batters: []cricinfo.LiveBatterView{
+					{PlayerName: "Numan Shah", Runs: 52, Balls: 41, StrikeRate: 126.82, OnStrike: true},
+				},
+				Bowlers: []cricinfo.LiveBowlerView{
+					{PlayerName: "Hayatullah Noori", Overs: 3, Conceded: 21, Wickets: 1, Economy: 7.0},
+				},
+				RecentBalls: []cricinfo.DeliveryEvent{delivery},
+			},
+		}),
+		duelResult: cricinfo.NewDataResult(cricinfo.EntityMatchDuel, cricinfo.MatchDuel{
+			MatchID:    "1529474",
+			BatterName: "Numan Shah",
+			BowlerName: "Hayatullah Noori",
+			Runs:       10,
+			Balls:      7,
+			Dots:       2,
+			Fours:      2,
+			StrikeRate: 142.86,
+			RecentBalls: []cricinfo.DeliveryEvent{
+				delivery,
+			},
+		}),
 		phasesResult: cricinfo.NewDataResult(cricinfo.EntityMatchPhases, cricinfo.MatchPhases{
 			MatchID: "1529474",
 			Innings: []cricinfo.MatchPhaseInning{
@@ -296,6 +338,15 @@ func TestMatchesCommandsRenderTextAndJSON(t *testing.T) {
 		t.Fatalf("expected plays text output to include normalized short text, got %q", playsOut.String())
 	}
 
+	var lineupOut bytes.Buffer
+	var lineupErr bytes.Buffer
+	if err := Run([]string{"matches", "lineup", "1529474", "--format", "text"}, &lineupOut, &lineupErr); err != nil {
+		t.Fatalf("Run matches lineup --format text error: %v", err)
+	}
+	if !strings.Contains(lineupOut.String(), "Player One") {
+		t.Fatalf("expected lineup text to include roster names, got %q", lineupOut.String())
+	}
+
 	var situationOut bytes.Buffer
 	var situationErr bytes.Buffer
 	if err := Run([]string{"matches", "situation", "1529474", "--format", "json"}, &situationOut, &situationErr); err != nil {
@@ -309,6 +360,26 @@ func TestMatchesCommandsRenderTextAndJSON(t *testing.T) {
 		t.Fatalf("expected kind %q in situation output, got %#v", cricinfo.EntityMatchSituation, situationPayload["kind"])
 	}
 
+	var liveViewOut bytes.Buffer
+	var liveViewErr bytes.Buffer
+	if err := Run([]string{"matches", "live-view", "1529474", "--format", "text"}, &liveViewOut, &liveViewErr); err != nil {
+		t.Fatalf("Run matches live-view --format text error: %v", err)
+	}
+	liveViewText := liveViewOut.String()
+	if !strings.Contains(liveViewText, "Batters") || !strings.Contains(liveViewText, "Bowlers") {
+		t.Fatalf("expected batters/bowlers sections in live-view output, got %q", liveViewText)
+	}
+
+	var duelOut bytes.Buffer
+	var duelErr bytes.Buffer
+	if err := Run([]string{"matches", "duel", "1529474", "--batter", "Numan Shah", "--bowler", "Hayatullah Noori", "--format", "text"}, &duelOut, &duelErr); err != nil {
+		t.Fatalf("Run matches duel --format text error: %v", err)
+	}
+	duelText := duelOut.String()
+	if !strings.Contains(duelText, "Duel:") || !strings.Contains(duelText, "Numan Shah") {
+		t.Fatalf("expected duel output to include matchup summary, got %q", duelText)
+	}
+
 	var inningsOut bytes.Buffer
 	var inningsErr bytes.Buffer
 	if err := Run([]string{"matches", "innings", "1529474", "--team", "BOOST", "--format", "text"}, &inningsOut, &inningsErr); err != nil {

package/internal/cli/search.go

@@ -95,6 +95,13 @@ func newSearchEntityCommand(name string, kind cricinfo.EntityKind, global *globa
 			for _, entity := range searchResult.Entities {
 				items = append(items, entity.ToRenderable())
 			}
+			if kind == cricinfo.EntityMatch && len(items) == 0 && query != "" {
+				fallbackItems, fallbackWarnings := fallbackMatchSearchItems(cmd.Context(), query, searchOpts.leagueID, searchOpts.limit)
+				if len(fallbackItems) > 0 {
+					items = fallbackItems
+				}
+				searchResult.Warnings = append(searchResult.Warnings, fallbackWarnings...)
+			}
 
 			result := cricinfo.NewListResult(kind, items)
 			if len(searchResult.Warnings) > 0 {
@@ -117,3 +124,152 @@ func newSearchEntityCommand(name string, kind cricinfo.EntityKind, global *globa
 
 	return command
 }
+
+func fallbackMatchSearchItems(ctx context.Context, query string, leagueID string, limit int) ([]any, []string) {
+	service, err := cricinfo.NewMatchService(cricinfo.MatchServiceConfig{})
+	if err != nil {
+		return nil, []string{fmt.Sprintf("match fallback init failed: %v", err)}
+	}
+	defer func() {
+		_ = service.Close()
+	}()
+
+	listLimit := limit
+	if listLimit < 20 {
+		listLimit = 20
+	}
+	if listLimit > 80 {
+		listLimit = 80
+	}
+
+	result, err := service.Live(ctx, cricinfo.MatchListOptions{Limit: listLimit, LeagueID: strings.TrimSpace(leagueID)})
+	if err != nil {
+		return nil, []string{fmt.Sprintf("match fallback live list failed: %v", err)}
+	}
+	if len(result.Items) == 0 {
+		result, err = service.List(ctx, cricinfo.MatchListOptions{Limit: listLimit, LeagueID: strings.TrimSpace(leagueID)})
+		if err != nil {
+			return nil, []string{fmt.Sprintf("match fallback list failed: %v", err)}
+		}
+	}
+
+	queryNorm := normalizeMatchSearchText(query)
+	queryTokens := strings.Fields(queryNorm)
+	if queryNorm == "" {
+		return nil, nil
+	}
+
+	items := make([]any, 0, limitOrDefault(limit, 10))
+	for _, raw := range result.Items {
+		match, ok := raw.(cricinfo.Match)
+		if !ok {
+			continue
+		}
+		if matchSearchScore(match, queryNorm, queryTokens) == 0 {
+			continue
+		}
+		items = append(items, match)
+		if len(items) >= limitOrDefault(limit, 10) {
+			break
+		}
+	}
+
+	if len(items) == 0 {
+		return nil, nil
+	}
+	return items, []string{"match search fallback used list/live aliases"}
+}
+
+func matchSearchScore(match cricinfo.Match, query string, queryTokens []string) int {
+	score := 0
+	for _, value := range []string{
+		match.ID,
+		match.Description,
+		match.ShortDescription,
+		match.Note,
+		match.ScoreSummary,
+	} {
+		score = maxInt(score, aliasScore(normalizeMatchSearchText(value), query, queryTokens))
+	}
+	for _, team := range match.Teams {
+		for _, value := range []string{
+			team.ID,
+			team.Name,
+			team.ShortName,
+			team.Abbreviation,
+		} {
+			score = maxInt(score, aliasScore(normalizeMatchSearchText(value), query, queryTokens))
+		}
+	}
+	return score
+}
+
+func aliasScore(alias, query string, queryTokens []string) int {
+	if alias == "" || query == "" {
+		return 0
+	}
+	if alias == query {
+		return 1000
+	}
+	if strings.HasPrefix(alias, query) {
+		return 800
+	}
+	if strings.Contains(alias, query) {
+		return 650
+	}
+	aliasTokens := strings.Fields(alias)
+	if len(aliasTokens) == 0 || len(queryTokens) == 0 {
+		return 0
+	}
+	matched := 0
+	for _, queryToken := range queryTokens {
+		for _, aliasToken := range aliasTokens {
+			if aliasToken == queryToken || strings.HasPrefix(aliasToken, queryToken) || (len(aliasToken) >= 2 && strings.HasPrefix(queryToken, aliasToken)) {
+				matched++
+				break
+			}
+		}
+	}
+	if matched == 0 {
+		return 0
+	}
+	return 300 + (matched * 60)
+}
+
+func normalizeMatchSearchText(raw string) string {
+	raw = strings.ToLower(strings.TrimSpace(raw))
+	if raw == "" {
+		return ""
+	}
+	var builder strings.Builder
+	lastSpace := false
+	for _, r := range raw {
+		if (r >= 'a' && r <= 'z') || (r >= '0' && r <= '9') {
+			builder.WriteRune(r)
+			lastSpace = false
+			continue
+		}
+		if !lastSpace {
+			builder.WriteRune(' ')
+			lastSpace = true
+		}
+	}
+	return strings.Join(strings.Fields(builder.String()), " ")
+}
+
+func maxInt(a, b int) int {
+	if a > b {
+		return a
+	}
+	return b
+}
+
+func limitOrDefault(value int, fallback int) int {
+	if value > 0 {
+		return value
+	}
+	if fallback <= 0 {
+		return 10
+	}
+	return fallback
+}