This commit is contained in:
Erik Winter 2023-12-22 20:20:20 +01:00
parent 56eb32de9f
commit 617d02b89e
4 changed files with 197 additions and 109 deletions

View File

@ -25,6 +25,12 @@ func NewTMDB(apikey string) (*TMDB, error) {
} }
func (t TMDB) Search(query string) ([]movie.Movie, error) { func (t TMDB) Search(query string) ([]movie.Movie, error) {
return []movie.Movie{
{Title: "movie1", Year: 2020, Summary: "summary1"},
{Title: "movie2", Year: 2020, Summary: "summary2"},
{Title: "movie3", Year: 2020, Summary: "summary3"},
}, nil
results, err := t.c.GetSearchMovies(query, nil) results, err := t.c.GetSearchMovies(query, nil)
if err != nil { if err != nil {
return nil, err return nil, err

View File

@ -0,0 +1,74 @@
package tui
import (
"fmt"
"github.com/charmbracelet/bubbles/textinput"
tea "github.com/charmbracelet/bubbletea"
)
type modelEdit struct {
movie Movie
focused string
ratingField textinput.Model
commentFiel textinput.Model
}
func NewEdit(movie Movie) *modelEdit {
m := &modelEdit{
movie: movie,
focused: "rating",
ratingField: textinput.New(),
commentFiel: textinput.New(),
}
m.ratingField.Placeholder = "Rating"
m.ratingField.Width = 2
m.ratingField.CharLimit = 2
m.ratingField.Focus()
return m
}
func (m modelEdit) Init() tea.Cmd {
return nil
}
func (m modelEdit) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
var cmd tea.Cmd
switch msg := msg.(type) {
case tea.KeyMsg:
switch msg.String() {
case "ctrl+c", "q", "esc":
return m, tea.Quit
case "tab":
switch m.focused {
case "rating":
m.focused = "comment"
m.commentFiel.Focus()
case "comment":
m.focused = "rating"
m.ratingField.Focus()
}
case "enter":
}
}
switch m.focused {
case "rating":
m.ratingField, cmd = m.ratingField.Update(msg)
case "comment":
m.commentFiel, cmd = m.commentFiel.Update(msg)
}
return m, cmd
}
func (m modelEdit) View() string {
return fmt.Sprintf("Title: \t%s\nSumary: \t%s\nRating: \t%s\nComment: \t%s\n",
m.movie.Title(),
m.movie.Description(),
m.ratingField.View(),
m.commentFiel.View(),
)
}

View File

@ -0,0 +1,116 @@
package tui
import (
"fmt"
"ewintr.nl/emdb/cmd/terminal-client/clients"
"github.com/charmbracelet/bubbles/list"
"github.com/charmbracelet/bubbles/textinput"
"github.com/charmbracelet/bubbles/viewport"
tea "github.com/charmbracelet/bubbletea"
)
type modelSearch struct {
tmdb *clients.TMDB
focused string
searchInput textinput.Model
searchResults list.Model
logContent string
ready bool
logViewport viewport.Model
}
func (m modelSearch) Init() tea.Cmd {
return nil
}
func (m modelSearch) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
var (
cmd tea.Cmd
cmds []tea.Cmd
)
switch msg := msg.(type) {
case tea.KeyMsg:
switch msg.String() {
case "ctrl+c", "q", "esc":
return m, tea.Quit
case "enter":
switch m.focused {
case "search":
m.Search()
case "result":
selected := m.searchResults.Items()[m.searchResults.Index()].(Movie)
m.Log(fmt.Sprintf("selected: %d - %s", m.searchResults.Index(), selected.Title()))
return NewEdit(selected), nil
}
}
case tea.WindowSizeMsg:
if !m.ready {
m.initialModel(msg.Width, msg.Height)
}
}
switch m.focused {
case "search":
m.searchInput, cmd = m.searchInput.Update(msg)
case "result":
m.searchResults, cmd = m.searchResults.Update(msg)
}
cmds = append(cmds, cmd)
return m, tea.Batch(cmds...)
}
func (m *modelSearch) Log(msg string) {
m.logContent = fmt.Sprintf("%s\n%s", m.logContent, msg)
m.logViewport.SetContent(m.logContent)
m.logViewport.GotoBottom()
}
func (m *modelSearch) Search() {
m.Log("start search")
movies, err := m.tmdb.Search(m.searchInput.Value())
if err != nil {
m.Log(fmt.Sprintf("error: %v", err))
return
}
m.Log(fmt.Sprintf("found %d results", len(movies)))
items := []list.Item{}
for _, res := range movies {
items = append(items, Movie{m: res})
}
m.searchResults.SetItems(items)
m.focused = "result"
}
func (m modelSearch) View() string {
if !m.ready {
return "\n Initializing..."
}
return fmt.Sprintf("%s\n---\n%s\n---\n%s", m.searchInput.View(), m.searchResults.View(), m.logViewport.View())
}
func (m *modelSearch) initialModel(width, height int) {
si := textinput.New()
si.Placeholder = "title"
si.CharLimit = 156
si.Width = 20
m.searchInput = si
m.searchInput.Focus()
m.searchResults = list.New([]list.Item{}, list.NewDefaultDelegate(), width, height-50)
m.searchResults.Title = "Search results"
m.searchResults.SetShowHelp(false)
m.logViewport = viewport.New(width, 10)
m.logViewport.SetContent(m.logContent)
m.logViewport.KeyMap = viewport.KeyMap{}
m.focused = "search"
m.ready = true
}

View File

@ -1,121 +1,13 @@
package tui package tui
import ( import (
"fmt"
"ewintr.nl/emdb/cmd/terminal-client/clients" "ewintr.nl/emdb/cmd/terminal-client/clients"
"github.com/charmbracelet/bubbles/list"
"github.com/charmbracelet/bubbles/textinput"
"github.com/charmbracelet/bubbles/viewport"
tea "github.com/charmbracelet/bubbletea" tea "github.com/charmbracelet/bubbletea"
) )
func New(tmdb *clients.TMDB) *tea.Program { func New(tmdb *clients.TMDB) *tea.Program {
m := model{ m := modelSearch{
tmdb: tmdb, tmdb: tmdb,
} }
return tea.NewProgram(m, tea.WithAltScreen()) return tea.NewProgram(m, tea.WithAltScreen())
} }
type model struct {
tmdb *clients.TMDB
focused string
searchInput textinput.Model
searchResults list.Model
logContent string
ready bool
logViewport viewport.Model
}
func (m model) Init() tea.Cmd {
return nil
}
func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
var (
cmd tea.Cmd
cmds []tea.Cmd
)
switch msg := msg.(type) {
case tea.KeyMsg:
switch msg.String() {
case "ctrl+c", "q", "esc":
return m, tea.Quit
case "enter":
switch m.focused {
case "search":
m.Search()
case "result":
m.Log(fmt.Sprintf("selected: %d", m.searchResults.Index()))
}
}
case tea.WindowSizeMsg:
if !m.ready {
m.initialModel(msg.Width, msg.Height)
}
}
switch m.focused {
case "search":
m.searchInput, cmd = m.searchInput.Update(msg)
case "result":
m.searchResults, cmd = m.searchResults.Update(msg)
}
cmds = append(cmds, cmd)
return m, tea.Batch(cmds...)
}
func (m *model) Log(msg string) {
m.logContent = fmt.Sprintf("%s\n%s", m.logContent, msg)
m.logViewport.SetContent(m.logContent)
m.logViewport.GotoBottom()
}
func (m *model) Search() {
m.Log("start search")
movies, err := m.tmdb.Search(m.searchInput.Value())
if err != nil {
m.Log(fmt.Sprintf("error: %v", err))
return
}
m.Log(fmt.Sprintf("found %d results", len(movies)))
items := []list.Item{}
for _, res := range movies {
items = append(items, Movie{m: res})
}
m.searchResults.SetItems(items)
m.focused = "result"
}
func (m model) View() string {
if !m.ready {
return "\n Initializing..."
}
return fmt.Sprintf("%s\n---\n%s\n---\n%s", m.searchInput.View(), m.searchResults.View(), m.logViewport.View())
}
func (m *model) initialModel(width, height int) {
si := textinput.New()
si.Placeholder = "title"
si.CharLimit = 156
si.Width = 20
m.searchInput = si
m.searchInput.Focus()
m.searchResults = list.New([]list.Item{}, list.NewDefaultDelegate(), width, height-50)
m.searchResults.Title = "Search results"
m.searchResults.SetShowHelp(false)
m.logViewport = viewport.New(width, 10)
m.logViewport.SetContent(m.logContent)
m.logViewport.KeyMap = viewport.KeyMap{}
m.focused = "search"
m.ready = true
}