Skip to content

Refine penalty event labels #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adrunkhuman merged 1 commit into from
Mar 22, 2026
Merged

Refine penalty event labels #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion internal/ui/render_helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,13 @@ func faintText(text string) string {
return "\x1b[2m" + text + "\x1b[0m"
}

func faintPenaltySuffix(text string) string {
if text == "" || !strings.Contains(text, "(pen)") {
return text
}
return strings.ReplaceAll(text, "(pen)", faintText("(pen)"))
}

func formatLeftEventLabel(kind, text string) string {
prefix := eventPrefix(kind)
if text == "" {
Expand Down Expand Up @@ -436,7 +443,7 @@ func formatPlayerLabel(value string) string {
cleaned += " " + strings.Join(suffixes, " ")
}

return cleaned
return faintPenaltySuffix(cleaned)
}

func digitsOnly(value string) bool {
Expand Down Expand Up @@ -975,6 +982,9 @@ func trimEventMinute(event site.MatchEvent) string {
text = strings.TrimSpace(strings.TrimPrefix(text, "->"))
text = normalizeSubstitutionText(text)
}
if event.Kind == "GOAL" {
text = strings.ReplaceAll(text, "(k)", "(pen)")
}
if event.Kind == "MISS" {
text = strings.ReplaceAll(text, "(nk)", "(pen)")
}
Expand Down
52 changes: 44 additions & 8 deletions internal/ui/view_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,24 +164,26 @@ func TestMatchTimelineShowsSymbolsAndHalftimeDivider(t *testing.T) {
m.match = &site.MatchPage{
HomeTeam: "GKS Katowice",
AwayTeam: "Lechia Gdansk",
Score: "2-0",
Score: "2-1",
Events: []site.MatchEvent{
{MinuteText: "39", Kind: "GOAL", TeamSide: "home", Text: "Wdowiak 39"},
{MinuteText: "52", Kind: "MISS", TeamSide: "away", Text: "Barkowskij 52 (nk)"},
{MinuteText: "46", Kind: "SUB", TeamSide: "away", Text: "O. Lesniak -> Pllana (4)"},
{MinuteText: "46", Kind: "SUB", TeamSide: "home", Text: "Igor Strzalek (86) -> Damian Nowak"},
{MinuteText: "60", Kind: "GOAL", TeamSide: "home", Text: "Szkurin 60"},
{MinuteText: "70", Kind: "GOAL", TeamSide: "away", Text: "Karol Czubak (k) 70"},
},
}

view := m.View()
plainView := ansi.Strip(view)
for _, want := range []string{
"Wdowiak",
"Szkurin",
"Wdowiak ⚽",
"39'",
"HT 1-0",
"FT 2-0",
"FT 2-1",
"Pllana ↕",
"I. Strzalek",
"D. Nowak",
Expand All @@ -190,22 +192,29 @@ func TestMatchTimelineShowsSymbolsAndHalftimeDivider(t *testing.T) {
"52'",
"Szkurin ⚽",
"60'",
"⚽ K. Czubak (pen)",
"70'",
} {
if !strings.Contains(view, want) {
if !strings.Contains(plainView, want) {
t.Fatalf("expected match view to contain %q\n%s", want, view)
}
}
if strings.Contains(view, "Wdowiak 39', Szkurin 60'") {
if !strings.Contains(view, "\x1b[2m(pen)\x1b[0m") {
t.Fatalf("expected rendered match view to dim penalty suffixes\n%s", view)
}
if strings.Contains(plainView, "Wdowiak 39', Szkurin 60'") {
t.Fatalf("expected scorers to render as separate rows\n%s", view)
}
timeline := view[strings.Index(view, "Timeline"):]
timeline := plainView[strings.Index(plainView, "Timeline"):]

indexes := []int{
strings.Index(timeline, "39'"),
strings.Index(timeline, "Pllana ↕"),
strings.Index(timeline, "D. Nowak"),
strings.Index(timeline, "52'"),
strings.Index(timeline, "Szkurin ⚽"),
strings.Index(timeline, "70'"),
strings.Index(timeline, "⚽ K. Czubak (pen)"),
}
for _, idx := range indexes {
if idx < 0 {
Expand All @@ -214,11 +223,29 @@ func TestMatchTimelineShowsSymbolsAndHalftimeDivider(t *testing.T) {
}
for i := 1; i < len(indexes); i++ {
if indexes[i-1] >= indexes[i] {
t.Fatalf("expected timeline order 39 -> 46 -> 46 -> 52 -> 60\n%s", timeline)
t.Fatalf("expected timeline order 39 -> 46 -> 46 -> 52 -> 60 -> 70\n%s", timeline)
}
}
}

func TestFormatEventLabelFormatsScoredPenalty(t *testing.T) {
home := formatEventLabel(site.MatchEvent{MinuteText: "70", Kind: "GOAL", TeamSide: "home", Text: "Karol Czubak (k) 70"})
away := formatEventLabel(site.MatchEvent{MinuteText: "70", Kind: "GOAL", TeamSide: "away", Text: "Karol Czubak (k) 70"})

if got := ansi.Strip(home); got != "K. Czubak (pen) ⚽" {
t.Fatalf("unexpected home scored penalty label: %q", got)
}
if got := ansi.Strip(away); got != "⚽ K. Czubak (pen)" {
t.Fatalf("unexpected away scored penalty label: %q", got)
}
if !strings.Contains(home, "\x1b[2m(pen)\x1b[0m") {
t.Fatalf("expected home scored penalty suffix to be dimmed, got %q", home)
}
if !strings.Contains(away, "\x1b[2m(pen)\x1b[0m") {
t.Fatalf("expected away scored penalty suffix to be dimmed, got %q", away)
}
}

func TestFormatEventLabelFormatsMissedPenalty(t *testing.T) {
home := formatEventLabel(site.MatchEvent{MinuteText: "52", Kind: "MISS", TeamSide: "home", Text: "Gierman Barkowskij 52 (nk)"})
away := formatEventLabel(site.MatchEvent{MinuteText: "52", Kind: "MISS", TeamSide: "away", Text: "Gierman Barkowskij 52 (nk)"})
Expand All @@ -229,6 +256,12 @@ func TestFormatEventLabelFormatsMissedPenalty(t *testing.T) {
if got := ansi.Strip(away); got != "❌ G. Barkowskij (pen)" {
t.Fatalf("unexpected away missed penalty label: %q", got)
}
if !strings.Contains(home, "\x1b[2m(pen)\x1b[0m") {
t.Fatalf("expected home missed penalty suffix to be dimmed, got %q", home)
}
if !strings.Contains(away, "\x1b[2m(pen)\x1b[0m") {
t.Fatalf("expected away missed penalty suffix to be dimmed, got %q", away)
}
}

func TestFormatEventLabelFormatsSubstitutionOrderAndStyles(t *testing.T) {
Expand Down Expand Up @@ -267,7 +300,7 @@ func TestMatchDetailRowsAnchorTowardCenteredMinuteColumn(t *testing.T) {

func TestMatchDetailMinuteColumnStaysFixedForDifferentHomeTextWidths(t *testing.T) {
short := renderMatchDetailRow("K. Kubica ⚽", "17'", "", 76)
long := renderMatchDetailRow("B. Wolski (k) ⚽", "78'", "", 76)
long := renderMatchDetailRow("B. Wolski (pen) ⚽", "78'", "", 76)
if strings.Index(short, "17'") != strings.Index(long, "78'") {
t.Fatalf("expected minute column to stay fixed\nshort: %q\nlong: %q", short, long)
}
Expand Down Expand Up @@ -297,9 +330,12 @@ func TestScorerTimelineUsesCenteredMinuteColumn(t *testing.T) {
if len(rows) != 2 {
t.Fatalf("expected two scorer rows, got %d", len(rows))
}
if rows[0].label != "K. Kubica ⚽" || rows[1].label != "⚽ K. Czubak (k)" {
if ansi.Strip(rows[0].label) != "K. Kubica ⚽" || ansi.Strip(rows[1].label) != "⚽ K. Czubak (pen)" {
t.Fatalf("unexpected scorer labels: %#v", rows)
}
if !strings.Contains(rows[1].label, "\x1b[2m(pen)\x1b[0m") {
t.Fatalf("expected scored penalty suffix to be dimmed, got %q", rows[1].label)
}
home := renderMatchDetailRow(rows[0].label, rows[0].minute, "", 76)
away := renderMatchDetailRow("", rows[1].minute, rows[1].label, 76)
homeMid := strings.Index(home, "17'") + (len("17'") / 2)
Expand Down