Music playback working

4 files changed, 110 insertions, 44 deletions

diff --git a/src/app.go b/src/app.go
index 8eed517..029644c 100644
--- a/src/app.go
+++ b/src/app.go
@@ -4,6 +4,7 @@ import (
         "fmt"
         "os"
 
+        "git.sixfoisneuf.fr/termsonic/music"
         "github.com/delucks/go-subsonic"
         "github.com/gdamore/tcell/v2"
         "github.com/rivo/tview"
@@ -11,23 +12,26 @@ import (
 
 type app struct {
         // General GUI
-        tv     *tview.Application
-        pages  *tview.Pages
-        header *tview.TextView
-        footer *tview.TextView
-        cfg    *Config
+        tv               *tview.Application
+        pages            *tview.Pages
+        headerSections   *tview.TextView
+        headerNowPlaying *tview.TextView
+        footer           *tview.TextView
+        cfg              *Config
 
         // Artists panel
         artistsTree *tview.TreeView
         songsList   *tview.List
 
         // Subsonic variables
-        sub *subsonic.Client
+        sub       *subsonic.Client
+        playQueue *music.Queue
 }
 
 func Run(cfg *Config) {
         a := &app{
-                cfg: cfg,
+                cfg:       cfg,
+                playQueue: music.NewQueue(nil),
         }
 
         a.tv = tview.NewApplication()
@@ -35,28 +39,13 @@ func Run(cfg *Config) {
         a.footer = tview.NewTextView().
                 SetDynamicColors(true)
 
-        a.header = tview.NewTextView().
-                SetRegions(true).
-                SetChangedFunc(func() {
-                        a.tv.Draw()
-                }).
-                SetHighlightedFunc(func(added, _, _ []string) {
-                        hl := added[0]
-                        cur, _ := a.pages.GetFrontPage()
-
-                        if hl != cur {
-                                a.switchToPage(hl)
-                        }
-                })
-        fmt.Fprintf(a.header, `["artists"]F1: Artists[""] | ["playlists"]F2: Playlists[""] | ["config"]F3: Configuration[""]`)
-
         a.pages.SetBorder(true)
         a.pages.AddPage("config", a.configPage(), true, false)
         a.pages.AddPage("artists", a.artistsPage(), true, false)
 
         mainLayout := tview.NewFlex().
                 SetDirection(tview.FlexRow).
-                AddItem(a.header, 1, 1, false).
+                AddItem(a.buildHeader(), 1, 1, false).
                 AddItem(a.pages, 0, 3, true).
                 AddItem(a.footer, 1, 1, false)
 
@@ -64,6 +53,7 @@ func Run(cfg *Config) {
                 a.switchToPage("config")
         } else {
                 a.sub, _ = buildSubsonicClient(a.cfg)
+                a.playQueue.SetClient(a.sub)
                 err := a.refreshArtists()
                 if err != nil {
                         a.alert("Could not refresh artists: %v", err)
@@ -104,14 +94,17 @@ func (a *app) switchToPage(name string) {
         switch name {
         case "artists":
                 a.pages.SwitchToPage("artists")
-                a.header.Highlight("artists")
+                a.headerSections.Highlight("artists")
                 a.tv.SetFocus(a.artistsTree)
+                a.pages.SetBorder(false)
         case "playlists":
                 a.pages.SwitchToPage("playlists")
-                a.header.Highlight("playlists")
+                a.headerSections.Highlight("playlists")
+                a.pages.SetBorder(true)
         case "config":
                 a.pages.SwitchToPage("config")
-                a.header.Highlight("config")
+                a.headerSections.Highlight("config")
+                a.pages.SetBorder(true)
         }
 
         a.updateFooter()
diff --git a/src/footer.go b/src/footer.go
index b0494d0..2695a61 100644
--- a/src/footer.go
+++ b/src/footer.go
@@ -1,14 +1,9 @@
 package src
 
 func (a *app) updateFooter() {
-        switch a.header.GetHighlights()[0] {
+        switch a.headerSections.GetHighlights()[0] {
         case "artists":
-                switch a.tv.GetFocus() {
-                case a.artistsTree:
-                        a.footer.SetText("Artists: [blue]Up/Down:[yellow] Move selection    [blue]Space:[yellow] Select entry")
-                case a.songsList:
-                        a.footer.SetText("Songs:   [blue]Up/Down:[yellow] Move selection    [blue]Space:[yellow] Play")
-                }
+                a.footer.SetText("[blue]l:[yellow] Next song    [blue]k:[yellow] Toggle pause")
         case "playlists":
                 a.footer.SetText("Come back later!")
         case "config":
diff --git a/src/header.go b/src/header.go
new file mode 100644
index 0000000..5c85808
--- /dev/null
+++ b/src/header.go
@@ -0,0 +1,47 @@
+package src
+
+import (
+        "fmt"
+
+        "github.com/delucks/go-subsonic"
+        "github.com/rivo/tview"
+)
+
+func (a *app) buildHeader() tview.Primitive {
+        flex := tview.NewFlex()
+        flex.SetDirection(tview.FlexColumn)
+
+        a.headerSections = tview.NewTextView().
+                SetRegions(true).
+                SetChangedFunc(func() {
+                        a.tv.Draw()
+                }).
+                SetHighlightedFunc(func(added, _, _ []string) {
+                        hl := added[0]
+                        cur, _ := a.pages.GetFrontPage()
+
+                        if hl != cur {
+                                a.switchToPage(hl)
+                        }
+                })
+        fmt.Fprintf(a.headerSections, `["artists"]F1: Artists[""] | ["playlists"]F2: Playlists[""] | ["config"]F3: Configuration[""]`)
+
+        a.headerNowPlaying = tview.NewTextView().SetTextAlign(tview.AlignRight)
+
+        flex.AddItem(a.headerSections, 0, 1, false)
+        flex.AddItem(a.headerNowPlaying, 0, 1, false)
+
+        a.playQueue.SetOnChangeCallback(func(song *subsonic.Child, isPaused bool) {
+                if song != nil {
+                        symbol := ">"
+                        if isPaused {
+                                symbol = "||"
+                        }
+                        a.headerNowPlaying.SetText(fmt.Sprintf("%s %s - %s", symbol, song.Title, song.Artist))
+                } else {
+                        a.headerNowPlaying.SetText("Not playing")
+                }
+        })
+
+        return flex
+}
diff --git a/src/page_artists.go b/src/page_artists.go
index e8ce180..4361767 100644
--- a/src/page_artists.go
+++ b/src/page_artists.go
@@ -4,6 +4,7 @@ import (
         "fmt"
         "time"
 
+        "github.com/delucks/go-subsonic"
         "github.com/gdamore/tcell/v2"
         "github.com/rivo/tview"
 )
@@ -14,9 +15,7 @@ type selection struct {
 }
 
 func (a *app) artistsPage() tview.Primitive {
-        grid := tview.NewGrid().
-                SetColumns(40, 0).
-                SetBorders(true)
+        grid := tview.NewFlex().SetDirection(tview.FlexColumn)
 
         // Artist & album list
         root := tview.NewTreeNode("Subsonic server").SetColor(tcell.ColorYellow)
@@ -37,18 +36,18 @@ func (a *app) artistsPage() tview.Primitive {
 
                         a.loadAlbumInPanel(sel.id)
                         a.tv.SetFocus(a.songsList)
-                        a.updateFooter()
                 })
+        a.artistsTree.SetBorderAttributes(tcell.AttrDim).SetBorder(true)
 
         // Songs list for the selected album
         a.songsList = tview.NewList()
         a.songsList.ShowSecondaryText(false)
+        a.songsList.SetBorderAttributes(tcell.AttrDim).SetBorder(true)
 
         // Change the left-right keys to switch between the panels
         a.artistsTree.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey {
                 if event.Key() == tcell.KeyLeft || event.Key() == tcell.KeyRight {
                         a.tv.SetFocus(a.songsList)
-                        a.updateFooter()
                         return nil
                 }
                 return event
@@ -57,14 +56,26 @@ func (a *app) artistsPage() tview.Primitive {
         a.songsList.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey {
                 if event.Key() == tcell.KeyLeft || event.Key() == tcell.KeyRight {
                         a.tv.SetFocus(a.artistsTree)
-                        a.updateFooter()
                         return nil
                 }
                 return event
         })
 
-        grid.AddItem(a.artistsTree, 0, 0, 1, 1, 0, 0, true)
-        grid.AddItem(a.songsList, 0, 1, 1, 2, 0, 0, false)
+        grid.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey {
+                if event.Rune() == 'l' {
+                        a.playQueue.Next()
+                        return nil
+                }
+
+                if event.Rune() == 'k' {
+                        a.playQueue.TogglePause()
+                        return nil
+                }
+                return event
+        })
+
+        grid.AddItem(a.artistsTree, 0, 1, true)
+        grid.AddItem(a.songsList, 0, 1, false)
 
         return grid
 }
@@ -113,12 +124,32 @@ func (a *app) loadAlbumInPanel(id string) error {
                 return err
         }
 
-        a.songsList.SetTitle(album.Name)
+        var songs []*subsonic.Child
+
         a.songsList.Clear()
-        for _, song := range album.Child {
+        for i := len(album.Child) - 1; i >= 0; i-- {
+                song := album.Child[i]
+                songNoPtr := *song
+                songs = append([]*subsonic.Child{&songNoPtr}, songs...)
+
+                songsCopy := make([]*subsonic.Child, len(songs))
+                copy(songsCopy, songs)
+
                 dur := time.Duration(song.Duration) * time.Second
-                a.songsList.AddItem(fmt.Sprintf("%-10s %d - %s", fmt.Sprintf("[%s]", dur.String()), song.Track, song.Title), "", 0, nil)
+
+                a.songsList.InsertItem(0, fmt.Sprintf("%-10s %d - %s", fmt.Sprintf("[%s]", dur.String()), song.Track, song.Title), "", 0, func() {
+                        a.playQueue.Clear()
+                        for _, s := range songsCopy {
+                                a.playQueue.Append(s)
+                        }
+                        err := a.playQueue.Play()
+                        if err != nil {
+                                a.alert("Error: %v", err)
+                        }
+                })
         }
 
+        a.songsList.SetCurrentItem(0)
+
         return nil
 }