Merge pull request #11 from 0xjuanma/settings-and-filter

feat[golazo]: new league customization and result filtering

Author: 0xjuanma

CHANGELOG.md

@@ -8,6 +8,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 
 ### Added
+- **League Selection** - New settings customization to select and persist league preferences
+- **Result List Filtering** - New / filtering command for all result lists
 
 ### Changed
 

assets/social-preview.png

@@ -8,6 +8,7 @@ require (
 	github.com/charmbracelet/lipgloss v1.1.0
 	github.com/lucasb-eyer/go-colorful v1.2.0
 	github.com/spf13/cobra v1.8.0
+	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (

go.mod

@@ -65,5 +65,7 @@ golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
 golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
 golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

go.sum

@@ -14,7 +14,7 @@ import (
 func (m model) handleMainViewKeys(msg tea.KeyMsg) (tea.Model, tea.Cmd) {
 	switch msg.String() {
 	case "j", "down":
-		if m.selected < 1 && !m.mainViewLoading {
+		if m.selected < 2 && !m.mainViewLoading { // 3 menu items: 0, 1, 2
 			m.selected++
 		}
 	case "k", "up":
@@ -25,6 +25,14 @@ func (m model) handleMainViewKeys(msg tea.KeyMsg) (tea.Model, tea.Cmd) {
 		if m.mainViewLoading {
 			return m, nil
 		}
+
+		// Handle Settings view separately (no API calls needed)
+		if m.selected == 2 {
+			m.settingsState = ui.NewSettingsState()
+			m.currentView = viewSettings
+			return m, nil
+		}
+
 		m.mainViewLoading = true
 		m.pendingSelection = m.selected
 
@@ -162,3 +170,33 @@ func (m model) loadStatsMatchDetails(matchID int) (tea.Model, tea.Cmd) {
 	m.statsViewLoading = true
 	return m, tea.Batch(m.spinner.Tick, ui.SpinnerTick(), fetchStatsMatchDetailsFotmob(m.fotmobClient, matchID, m.useMockData))
 }
+
+// handleSettingsViewKeys processes keyboard input for the settings view.
+// Handles navigation (up/down), selection toggle (space), save (enter), and cancel (esc).
+func (m model) handleSettingsViewKeys(msg tea.KeyMsg) (tea.Model, tea.Cmd) {
+	if m.settingsState == nil {
+		return m, nil
+	}
+
+	switch msg.String() {
+	case "j", "down":
+		m.settingsState.MoveDown()
+	case "k", "up":
+		m.settingsState.MoveUp()
+	case " ": // Space to toggle
+		m.settingsState.Toggle()
+	case "enter":
+		// Save settings and return to main menu
+		_ = m.settingsState.Save() // Best-effort save
+		m.settingsState = nil
+		m.currentView = viewMain
+		m.selected = 0
+	case "esc":
+		// Cancel and return to main menu without saving
+		m.settingsState = nil
+		m.currentView = viewMain
+		m.selected = 0
+	}
+
+	return m, nil
+}

internal/app/handlers.go

@@ -17,6 +17,7 @@ const (
 	viewMain view = iota
 	viewLiveMatches
 	viewStats
+	viewSettings
 )
 
 // model holds the application state.
@@ -73,6 +74,9 @@ type model struct {
 	useMockData    bool
 	statsDateRange int // 1, 3, or 5 days (default: 1)
 
+	// Settings view state
+	settingsState *ui.SettingsState
+
 	// API clients
 	fotmobClient *fotmob.Client
 	parser       *fotmob.LiveUpdateParser
@@ -98,20 +102,38 @@ func New(useMockData bool) model {
 	// Initialize list models with custom delegate
 	delegate := ui.NewMatchListDelegate()
 
+	// Filter input styles matching neon theme
+	filterCursorStyle, filterPromptStyle := ui.FilterInputStyles()
+
 	liveList := list.New([]list.Item{}, delegate, 0, 0)
 	liveList.SetShowTitle(false)
-	liveList.SetShowStatusBar(false)
-	liveList.SetFilteringEnabled(false)
+	liveList.SetShowStatusBar(true)
+	liveList.SetFilteringEnabled(true)
+	liveList.SetShowFilter(true)
+	liveList.Filter = list.DefaultFilter // Required for filtering to work
+	liveList.Styles.FilterCursor = filterCursorStyle
+	liveList.FilterInput.PromptStyle = filterPromptStyle
+	liveList.FilterInput.Cursor.Style = filterCursorStyle
 
 	statsList := list.New([]list.Item{}, delegate, 0, 0)
 	statsList.SetShowTitle(false)
-	statsList.SetShowStatusBar(false)
-	statsList.SetFilteringEnabled(false)
+	statsList.SetShowStatusBar(true)
+	statsList.SetFilteringEnabled(true)
+	statsList.SetShowFilter(true)
+	statsList.Filter = list.DefaultFilter // Required for filtering to work
+	statsList.Styles.FilterCursor = filterCursorStyle
+	statsList.FilterInput.PromptStyle = filterPromptStyle
+	statsList.FilterInput.Cursor.Style = filterCursorStyle
 
 	upcomingList := list.New([]list.Item{}, delegate, 0, 0)
 	upcomingList.SetShowTitle(false)
-	upcomingList.SetShowStatusBar(false)
-	upcomingList.SetFilteringEnabled(false)
+	upcomingList.SetShowStatusBar(true)
+	upcomingList.SetFilteringEnabled(true)
+	upcomingList.SetShowFilter(true)
+	upcomingList.Filter = list.DefaultFilter // Required for filtering to work
+	upcomingList.Styles.FilterCursor = filterCursorStyle
+	upcomingList.FilterInput.PromptStyle = filterPromptStyle
+	upcomingList.FilterInput.Cursor.Style = filterCursorStyle
 
 	return model{
 		currentView:         viewMain,

internal/app/model.go

@@ -6,6 +6,7 @@ import (
 	"github.com/0xjuanma/golazo/internal/api"
 	"github.com/0xjuanma/golazo/internal/fotmob"
 	"github.com/0xjuanma/golazo/internal/ui"
+	"github.com/charmbracelet/bubbles/list"
 	"github.com/charmbracelet/bubbles/spinner"
 	tea "github.com/charmbracelet/bubbletea"
 )
@@ -57,6 +58,10 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	case pollDisplayCompleteMsg:
 		return m.handlePollDisplayComplete()
 
+	case list.FilterMatchesMsg:
+		// Route filter matches message to the appropriate list based on current view
+		return m.handleFilterMatches(msg)
+
 	default:
 		// Fallback handler for ui.TickMsg type assertion
 		if _, ok := msg.(ui.TickMsg); ok {
@@ -198,6 +203,23 @@ func (m model) handleKeyPress(msg tea.KeyMsg) (tea.Model, tea.Cmd) {
 	case "q", "ctrl+c":
 		return m, tea.Quit
 	case "esc":
+		// Check if any list is in filtering mode - if so, let the list handle Esc
+		// to cancel the filter instead of navigating back
+		isFiltering := false
+		switch m.currentView {
+		case viewLiveMatches:
+			isFiltering = m.liveMatchesList.FilterState() == list.Filtering ||
+				m.liveMatchesList.FilterState() == list.FilterApplied
+		case viewStats:
+			isFiltering = m.statsMatchesList.FilterState() == list.Filtering ||
+				m.statsMatchesList.FilterState() == list.FilterApplied
+		}
+
+		if isFiltering {
+			// Let the view-specific handler pass Esc to the list to cancel filter
+			break
+		}
+
 		if m.currentView != viewMain {
 			return m.resetToMainView()
 		}
@@ -211,6 +233,8 @@ func (m model) handleKeyPress(msg tea.KeyMsg) (tea.Model, tea.Cmd) {
 		return m.handleLiveMatchesSelection(msg)
 	case viewStats:
 		return m.handleStatsSelection(msg)
+	case viewSettings:
+		return m.handleSettingsViewKeys(msg)
 	}
 
 	return m, nil
@@ -233,43 +257,106 @@ func (m model) resetToMainView() (tea.Model, tea.Cmd) {
 
 // handleLiveMatchesSelection handles list navigation in live matches view.
 func (m model) handleLiveMatchesSelection(msg tea.KeyMsg) (tea.Model, tea.Cmd) {
+	// Capture selected item BEFORE Update (critical for filter mode - selection changes after filter clears)
+	var preUpdateMatchID int
+	if preItem := m.liveMatchesList.SelectedItem(); preItem != nil {
+		if item, ok := preItem.(ui.MatchListItem); ok {
+			preUpdateMatchID = item.Match.ID
+		}
+	}
+
 	var listCmd tea.Cmd
 	m.liveMatchesList, listCmd = m.liveMatchesList.Update(msg)
 
-	if selectedItem := m.liveMatchesList.SelectedItem(); selectedItem != nil {
-		if item, ok := selectedItem.(ui.MatchListItem); ok {
-			for i, match := range m.matches {
-				if match.ID == item.Match.ID && i != m.selected {
-					m.selected = i
-					return m.loadMatchDetails(m.matches[m.selected].ID)
-				}
+	// Get currently displayed match ID
+	currentMatchID := 0
+	if m.matchDetails != nil {
+		currentMatchID = m.matchDetails.ID
+	}
+
+	// Check post-update selection
+	var postUpdateMatchID int
+	if postItem := m.liveMatchesList.SelectedItem(); postItem != nil {
+		if item, ok := postItem.(ui.MatchListItem); ok {
+			postUpdateMatchID = item.Match.ID
+		}
+	}
+
+	// Use pre-update selection if it was valid and different from current
+	// This handles the filter case where Enter clears the filter
+	targetMatchID := postUpdateMatchID
+	if msg.String() == "enter" && preUpdateMatchID != 0 {
+		targetMatchID = preUpdateMatchID
+	}
+
+	// Load match details if selection changed
+	if targetMatchID != 0 && targetMatchID != currentMatchID {
+		for i, match := range m.matches {
+			if match.ID == targetMatchID {
+				m.selected = i
+				break
 			}
 		}
+		return m.loadMatchDetails(targetMatchID)
 	}
 
 	return m, listCmd
 }
 
 // handleStatsSelection handles list navigation and date range changes in stats view.
 func (m model) handleStatsSelection(msg tea.KeyMsg) (tea.Model, tea.Cmd) {
-	// Handle date range navigation
-	if msg.String() == "h" || msg.String() == "left" || msg.String() == "l" || msg.String() == "right" {
-		return m.handleStatsViewKeys(msg)
+	// Check if list is in filtering mode - if so, let list handle ALL keys
+	isFiltering := m.statsMatchesList.FilterState() == list.Filtering
+
+	// Only handle date range navigation when NOT filtering
+	if !isFiltering {
+		if msg.String() == "h" || msg.String() == "left" || msg.String() == "l" || msg.String() == "right" {
+			return m.handleStatsViewKeys(msg)
+		}
+	}
+
+	// Capture selected item BEFORE Update (critical for filter mode - selection changes after filter clears)
+	var preUpdateMatchID int
+	if preItem := m.statsMatchesList.SelectedItem(); preItem != nil {
+		if item, ok := preItem.(ui.MatchListItem); ok {
+			preUpdateMatchID = item.Match.ID
+		}
 	}
 
 	// Handle list navigation
 	var listCmd tea.Cmd
 	m.statsMatchesList, listCmd = m.statsMatchesList.Update(msg)
 
-	if selectedItem := m.statsMatchesList.SelectedItem(); selectedItem != nil {
-		if item, ok := selectedItem.(ui.MatchListItem); ok {
-			for i, match := range m.matches {
-				if match.ID == item.Match.ID && i != m.selected {
-					m.selected = i
-					return m.loadStatsMatchDetails(m.matches[m.selected].ID)
-				}
+	// Get currently displayed match ID
+	currentMatchID := 0
+	if m.matchDetails != nil {
+		currentMatchID = m.matchDetails.ID
+	}
+
+	// Check post-update selection
+	var postUpdateMatchID int
+	if postItem := m.statsMatchesList.SelectedItem(); postItem != nil {
+		if item, ok := postItem.(ui.MatchListItem); ok {
+			postUpdateMatchID = item.Match.ID
+		}
+	}
+
+	// Use pre-update selection if it was valid and different from current
+	// This handles the filter case where Enter clears the filter
+	targetMatchID := postUpdateMatchID
+	if msg.String() == "enter" && preUpdateMatchID != 0 {
+		targetMatchID = preUpdateMatchID
+	}
+
+	// Load match details if selection changed
+	if targetMatchID != 0 && targetMatchID != currentMatchID {
+		for i, match := range m.matches {
+			if match.ID == targetMatchID {
+				m.selected = i
+				break
 			}
 		}
+		return m.loadStatsMatchDetails(targetMatchID)
 	}
 
 	return m, listCmd
@@ -738,6 +825,28 @@ func (m model) handlePollDisplayComplete() (tea.Model, tea.Cmd) {
 	return m, nil
 }
 
+// handleFilterMatches routes filter matches messages to the appropriate list.
+// This is required for the bubbles list filter to work - it fires async matching
+// and sends results via FilterMatchesMsg which must be routed back to the list.
+func (m model) handleFilterMatches(msg list.FilterMatchesMsg) (tea.Model, tea.Cmd) {
+	var cmd tea.Cmd
+
+	switch m.currentView {
+	case viewLiveMatches:
+		m.liveMatchesList, cmd = m.liveMatchesList.Update(msg)
+	case viewStats:
+		m.statsMatchesList, cmd = m.statsMatchesList.Update(msg)
+		// Also update upcoming list in case it's being filtered
+		var upCmd tea.Cmd
+		m.upcomingMatchesList, upCmd = m.upcomingMatchesList.Update(msg)
+		if upCmd != nil {
+			cmd = tea.Batch(cmd, upCmd)
+		}
+	}
+
+	return m, cmd
+}
+
 // max returns the larger of two integers.
 func max(a, b int) int {
 	if a > b {

internal/app/update.go

@@ -40,6 +40,9 @@ func (m model) View() string {
 			m.statsTotalDays,
 		)
 
+	case viewSettings:
+		return ui.RenderSettingsView(m.width, m.height, m.settingsState)
+
 	default:
 		return ui.RenderMainMenu(m.width, m.height, m.selected, m.spinner, m.randomSpinner, m.mainViewLoading)
 	}

internal/app/view.go

@@ -4,6 +4,7 @@ package constants
 const (
 	MenuStats       = "Stats"
 	MenuLiveMatches = "Live Matches"
+	MenuSettings    = "Settings"
 )
 
 // Panel titles
@@ -26,8 +27,9 @@ const (
 
 // Help text
 const (
-	HelpMainMenu    = "↑/↓: navigate  Enter: select  q: quit"
-	HelpMatchesView = "↑/↓: navigate  Esc: back  q: quit"
+	HelpMainMenu     = "↑/↓: navigate  Enter: select  q: quit"
+	HelpMatchesView  = "↑/↓: navigate  /: filter  Esc: back  q: quit"
+	HelpSettingsView = "↑/↓: navigate  Space: toggle  Enter: save  Esc: cancel"
 )
 
 // Status text