refactor: organize behavioral states (#39)

Author: hedhyw

Makefile

@@ -29,7 +29,8 @@ lint: bin/golangci-lint
 test:
 	go test \
 		-coverpkg=${COVER_PACKAGES} \
-		-covermode=count \
+		-covermode=atomic \
+		-race \
 		-coverprofile=coverage.out \
 		./...
 	go tool cover -func=coverage.out

assets/example.log

@@ -45,11 +45,11 @@
 {"time":"1970-01-01T00:00:00.00","level":"DEBUG","message": "A house divided against itself cannot stand.","author": "Abraham Lincoln"}
 {"time":"1970-01-01T00:00:00.00","level":"TRACE","message": "Difficulties increase the nearer we get to the goal.","author": "Johann Wolfgang von Goethe"}
 plain text log
-{"time":"12444334.222","level":"TRACE","message": "Wealth consists not in having great possessions, but in having few wants.","author": "Epictetus"}
-{"time":12444334.222,"level":"INFO","message": "Laugh at the world's foolishness or weep over it, you will regret both","author": "Kierkegaard"}
-{"time":12444334,"level":"WARN","message": "Wealth consists not in having great possessions, but in having few wants.","author": "Epictetus"}
-{"time":"12444334","level":"DEBUG","message": "Wealth consists not in having great possessions, but in having few wants.","author": "Epictetus"}
-{"time":124999444443,"level":"TRACE","message": "Money doesn't talk, it swears","author": "Bob Dylan"}
-{"time":124999444443.45,"level":"WARN","message": "If a man knows not to which port he sails, no wind is favorable","author": "Seneca"}
-{"time":"124999444443.45","level":"VERBOSE","message": "Begin at once to live, and count each separate day as a separate life","author": "Seneca"}
-{"time":12499944444398.45,"level":"VERBOSE","message": "Begin at once to live, and count each separate day as a separate life","author": "Seneca"}
+{"time":"725850000.222","level":"TRACE","message": "Wealth consists not in having great possessions, but in having few wants.","author": "Epictetus"}
+{"time":757386000.222,"level":"INFO","message": "Laugh at the world's foolishness or weep over it, you will regret both","author": "Kierkegaard"}
+{"time":788922000,"level":"WARN","message": "Wealth consists not in having great possessions, but in having few wants.","author": "Epictetus"}
+{"time":"820454400","level":"DEBUG","message": "Wealth consists not in having great possessions, but in having few wants.","author": "Epictetus"}
+{"time":865900800,"level":"TRACE","message": "Money doesn't talk, it swears","author": "Bob Dylan"}
+{"time":883612800.45,"level":"WARN","message": "If a man knows not to which port he sails, no wind is favorable","author": "Seneca"}
+{"time":"915148800000.45","level":"VERBOSE","message": "Begin at once to live, and count each separate day as a separate life","author": "Seneca"}
+{"time":946684800.45,"level":"VERBOSE","message": "Begin at once to live, and count each separate day as a separate life","author": "Seneca"}

internal/app/action.go

@@ -1,97 +1,45 @@
 package app
 
 import (
-	"github.com/charmbracelet/bubbles/table"
-	"github.com/charmbracelet/bubbles/textinput"
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/lipgloss"
 
 	"github.com/hedhyw/json-log-viewer/internal/pkg/config"
-	"github.com/hedhyw/json-log-viewer/internal/pkg/source"
 )
 
-// Model of the application.
-type Model struct {
-	config *config.Config
+// Application global state.
+type Application struct {
+	Path   string
+	Config *config.Config
 
-	baseStyle   lipgloss.Style
-	footerStyle lipgloss.Style
+	BaseStyle   lipgloss.Style
+	FooterStyle lipgloss.Style
 
-	fileLogPath string
-
-	table         table.Model
-	allLogEntries source.LogEntries
-
-	filteredLogEntries source.LogEntries
-
-	lastWindowSize tea.WindowSizeMsg
-	jsonView       tea.Model
-
-	textInputShown bool
-	textInput      textinput.Model
-
-	err error
+	LastWindowSize tea.WindowSizeMsg
 }
 
-// NewModel initializes a new application model. It accept the path
-// to the file with logs.
-func NewModel(path string, cfg *config.Config) Model {
-	tableLogs := table.New(
-		table.WithColumns(getColumns(100, cfg)),
-		table.WithFocused(true),
-		table.WithHeight(7),
+func newApplication(path string, config *config.Config) Application {
+	const (
+		initialWidth  = 70
+		initialHeight = 20
 	)
 
-	tableLogs.SetStyles(getTableStyles())
-
-	return Model{
-		config: cfg,
-
-		baseStyle:   getBaseStyle(),
-		footerStyle: getFooterStyle(),
-
-		fileLogPath: path,
-		table:       tableLogs,
+	return Application{
+		Path:   path,
+		Config: config,
 
-		err:                nil,
-		allLogEntries:      nil,
-		filteredLogEntries: nil,
+		BaseStyle:   getBaseStyle(),
+		FooterStyle: getFooterStyle(),
 
-		textInputShown: false,
-		textInput:      textinput.Model{},
-
-		lastWindowSize: tea.WindowSizeMsg{},
-		jsonView:       nil,
-	}
-}
-
-// Init implements team.Model interface.
-func (m Model) Init() tea.Cmd {
-	return source.LoadLogsFromFile(m.fileLogPath, m.config)
-}
-
-// Update implements team.Model interface.
-func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
-	switch msg := msg.(type) {
-	case tea.WindowSizeMsg:
-		m = m.handleWindowSizeMsg(msg)
-	case source.LogEntries:
-		m = m.handleLogEntriesMsg(msg)
-	case error:
-		m = m.handleErrorMsg(msg)
-
-		return m, nil
-	case tea.KeyMsg:
-		newModel, cmd := m.handleKeyMsg(msg)
-		if newModel != nil || cmd != nil {
-			return newModel, cmd
-		}
+		LastWindowSize: tea.WindowSizeMsg{
+			Width:  initialWidth,
+			Height: initialHeight,
+		},
 	}
-
-	return m.handleUpdateInViews(msg)
 }
 
-// View implements team.Model interface.
-func (m Model) View() string {
-	return m.renderViews()
+// NewModel initializes a new application model. It accept the path
+// to the file with logs.
+func NewModel(path string, config *config.Config) tea.Model {
+	return newStateInitial(newApplication(path, config))
 }