This commit is contained in:
jjohnstondev 2023-01-08 20:42:02 -08:00
parent ecef56c4f0
commit f5f176b801
4 changed files with 138 additions and 8 deletions

View File

@ -12,12 +12,7 @@ import (
func Run(ctx *gctx.Context, client *spotify.Client, args []string) error {
if len(args) == 0 {
user, err := client.CurrentUser(ctx)
if err != nil {
return fmt.Errorf("Failed to get current user")
}
fmt.Println("The following commands are currently supported:\nplay pause next shuffle\nhave fun", user.DisplayName)
return nil
return tui.DisplayMain(ctx, client)
}
switch args[0] {
case "play":

View File

@ -66,6 +66,10 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
}
switch msg := msg.(type) {
case tea.KeyMsg:
if msg.String() == "backspace" || msg.String() == "q" || msg.String() == "esc" {
DisplayMain(m.ctx, m.client)
return m, tea.Quit
}
if msg.String() == "ctrl+c" {
return m, tea.Quit
}

130
internal/tui/main.go Normal file
View File

@ -0,0 +1,130 @@
package tui
import (
"fmt"
"os"
"gospt/internal/commands"
"gospt/internal/gctx"
"github.com/charmbracelet/bubbles/list"
tea "github.com/charmbracelet/bubbletea"
"github.com/zmb3/spotify/v2"
)
type mainItem struct {
Name string
Desc string
SpotifyItem any
}
func (i mainItem) Title() string { return i.Name }
func (i mainItem) Description() string { return i.Desc }
func (i mainItem) FilterValue() string { return i.Title() + i.Desc }
type mainModel struct {
list list.Model
page int
ctx *gctx.Context
client *spotify.Client
}
func (m mainModel) Init() tea.Cmd {
return nil
}
func (m mainModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
if m.list.Paginator.OnLastPage() {
// if the last request was not full
if len(m.list.Items())%50 == 0 {
playlists, err := commands.Playlists(m.ctx, m.client, (m.page + 1))
if err != nil {
return m, tea.Quit
}
m.page++
items := []list.Item{}
for _, playlist := range playlists.Playlists {
items = append(items, mainItem{
Name: playlist.Name,
Desc: playlist.Description,
SpotifyItem: playlist,
})
}
for _, item := range items {
m.list.InsertItem(len(m.list.Items())+1, item)
}
}
}
switch msg := msg.(type) {
case tea.KeyMsg:
if msg.String() == "ctrl+c" {
return m, tea.Quit
}
if msg.String() == "enter" {
switch m.list.SelectedItem().(mainItem).SpotifyItem.(type) {
case spotify.SimplePlaylist:
playlist := m.list.SelectedItem().(mainItem).SpotifyItem.(spotify.SimplePlaylist)
PlaylistTracks(m.ctx, m.client, playlist)
return m, tea.Quit
case *spotify.SavedTrackPage:
DisplayList(m.ctx, m.client)
return m, tea.Quit
}
return m, tea.Quit
}
case tea.MouseMsg:
if msg.Type == 5 {
m.list.CursorUp()
}
if msg.Type == 6 {
m.list.CursorDown()
}
case tea.WindowSizeMsg:
h, v := docStyle.GetFrameSize()
m.list.SetSize(msg.Width-h, msg.Height-v)
}
var cmd tea.Cmd
m.list, cmd = m.list.Update(msg)
return m, cmd
}
func (m mainModel) View() string {
return docStyle.Render(m.list.View())
}
func DisplayMain(ctx *gctx.Context, client *spotify.Client) error {
items := []list.Item{}
saved_items, err := commands.TrackList(ctx, client, 1)
items = append(items, mainItem{
Name: "Saved Tracks",
Desc: fmt.Sprintf("%d saved songs", saved_items.Total),
SpotifyItem: saved_items,
})
playlists, err := commands.Playlists(ctx, client, 1)
if err != nil {
return err
}
for _, playlist := range playlists.Playlists {
items = append(items, mainItem{
Name: playlist.Name,
Desc: playlist.Description,
SpotifyItem: playlist,
})
}
m := mainModel{
list: list.New(items, list.NewDefaultDelegate(), 0, 0),
page: 1,
ctx: ctx,
client: client,
}
m.list.Title = "Saved Tracks"
p := tea.NewProgram(m, tea.WithAltScreen(), tea.WithMouseCellMotion())
if _, err := p.Run(); err != nil {
fmt.Println("Error running program:", err)
os.Exit(1)
}
return nil
}

View File

@ -65,8 +65,9 @@ func (m playlistTracksModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
}
switch msg := msg.(type) {
case tea.KeyMsg:
if msg.String() == "backspace" || msg.String() == "q" {
DisplayPlaylists(m.ctx, m.client)
if msg.String() == "backspace" || msg.String() == "q" || msg.String() == "esc" {
DisplayMain(m.ctx, m.client)
return m, tea.Quit
}
if msg.String() == "ctrl+c" {
return m, tea.Quit