add album page showing track listing

backend/albumiterator.go

@@ -14,15 +14,15 @@ type AlbumIterator interface {
 }
 
 type LibraryManager struct {
-	s          *ServerManager
+	s                *ServerManager
-	albumCache gcache.Cache
+	albumDetailCache gcache.Cache
 }
 
 func NewLibraryManager(s *ServerManager) *LibraryManager {
 	cache := gcache.New(250).LRU().Build()
 	return &LibraryManager{
-		s:          s,
+		s:                s,
-		albumCache: cache,
+		albumDetailCache: cache,
 	}
 }
 
@@ -77,12 +77,12 @@ func (l *LibraryManager) SearchIter(query string) AlbumIterator {
 }
 
 func (l *LibraryManager) CacheAlbum(a *subsonic.AlbumID3) {
-	l.albumCache.Set(a.ID, a)
+	l.albumDetailCache.Set(a.ID, a)
 }
 
 func (l *LibraryManager) GetAlbum(id string) (*subsonic.AlbumID3, error) {
-	if l.albumCache.Has(id) {
+	if l.albumDetailCache.Has(id) {
-		if a, err := l.albumCache.Get(id); err == nil {
+		if a, err := l.albumDetailCache.Get(id); err == nil {
 			return a.(*subsonic.AlbumID3), nil
 		}
 	}
@@ -90,7 +90,7 @@ func (l *LibraryManager) GetAlbum(id string) (*subsonic.AlbumID3, error) {
 	if err != nil {
 		return nil, err
 	}
-	l.albumCache.Set(a.ID, a)
+	l.albumDetailCache.Set(a.ID, a)
 	return a, nil
 }
 
@@ -126,7 +126,6 @@ func (r *baseIter) Next() *subsonic.AlbumID3 {
 		}
 		r.pos++
 
-		r.l.CacheAlbum(a)
 		return a
 	}
 	albums, err := r.s.GetAlbumList2(r.listType, map[string]string{"size": "20", "offset": strconv.Itoa(r.pos)})
@@ -138,14 +137,12 @@ func (r *baseIter) Next() *subsonic.AlbumID3 {
 		r.done = true
 		return nil
 	} else if len(albums) == 1 {
-		r.l.CacheAlbum(albums[0])
 		r.done = true
 		return albums[0]
 	}
 	r.prefetched = albums
 	r.prefetchedPos = 1
 
-	r.l.CacheAlbum(r.prefetched[0])
 	return r.prefetched[0]
 }
 
@@ -239,7 +236,6 @@ func (s *searchIter) Next() *subsonic.AlbumID3 {
 			s.prefetchedPos = 0
 		}
 
-		s.l.CacheAlbum(a)
 		return a
 	}
 
@@ -349,7 +345,6 @@ func (r *randomIter) Next() *subsonic.AlbumID3 {
 			r.prefetchedPos = 0
 		}
 
-		r.l.CacheAlbum(a)
 		return a
 	}
 

backend/playbackmanager.go

@@ -124,11 +124,14 @@ func (p *PlaybackManager) LoadAlbum(albumID string, appendToQueue bool) error {
 	return nil
 }
 
-func (p *PlaybackManager) PlayAlbum(albumID string) error {
+func (p *PlaybackManager) PlayAlbum(albumID string, firstTrack int) error {
 	if err := p.LoadAlbum(albumID, false); err != nil {
 		return err
 	}
-	return p.player.PlayFromBeginning()
+	if firstTrack <= 0 {
+		return p.player.PlayFromBeginning()
+	}
+	return p.player.PlayTrackAt(firstTrack)
 }
 
 func (p *PlaybackManager) checkScrobble(playDur time.Duration) {

player/player.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"strconv"
 
 	"github.com/wildeyedskies/go-mpv/mpv"
 )
@@ -226,6 +227,15 @@ func (p *Player) PlayFromBeginning() error {
 	return err
 }
 
+// Start playback from the specified track index in the play queue.
+func (p *Player) PlayTrackAt(idx int) error {
+	err := p.mpv.Command([]string{"playlist-play-index", strconv.Itoa(idx)})
+	if err == nil {
+		p.setState(Playing)
+	}
+	return err
+}
+
 // Begins playback if there is anything in the play queue and player is stopped or paused.
 // If player is playing, pauses playback.
 func (p *Player) PlayPause() error {

ui/albumgrid.go

@@ -26,6 +26,7 @@ type AlbumGrid struct {
 
 	imageFetcher     ImageFetcher
 	OnPlayAlbum      func(string)
+	OnShowAlbumPage  func(string)
 	OnShowArtistPage func(string)
 }
 
@@ -88,6 +89,11 @@ func (ag *AlbumGrid) createGridWrapList() {
 					ag.OnShowArtistPage(ac.ArtistID())
 				}
 			}
+			ac.OnShowAlbumPage = func() {
+				if ag.OnShowAlbumPage != nil {
+					ag.OnShowAlbumPage(ac.AlbumID())
+				}
+			}
 			return ac
 		},
 		// update func

ui/albumpage.go

@@ -0,0 +1,68 @@
+package ui
+
+import (
+	"log"
+	"supersonic/backend"
+	"supersonic/ui/widgets"
+
+	"fyne.io/fyne/v2"
+	"fyne.io/fyne/v2/container"
+	"fyne.io/fyne/v2/layout"
+	"fyne.io/fyne/v2/theme"
+	"fyne.io/fyne/v2/widget"
+)
+
+type AlbumPage struct {
+	widget.BaseWidget
+
+	albumID   string
+	im        *backend.ImageManager
+	lm        *backend.LibraryManager
+	titleDisp *widget.RichText
+	tracklist *widgets.Tracklist
+	container *fyne.Container
+
+	OnPlayAlbum func(string, int)
+}
+
+func NewAlbumPage(albumID string, lm *backend.LibraryManager) *AlbumPage {
+	a := &AlbumPage{albumID: albumID, lm: lm}
+	a.ExtendBaseWidget(a)
+	a.titleDisp = widget.NewRichTextWithText("Artist")
+	a.titleDisp.Segments[0].(*widget.TextSegment).Style = widget.RichTextStyle{
+		SizeName: theme.SizeNameHeadingText,
+	}
+	a.container = container.NewBorder(a.titleDisp, nil, nil, nil, layout.NewSpacer())
+	a.loadAsync()
+	return a
+}
+
+func (a *AlbumPage) CreateRenderer() fyne.WidgetRenderer {
+	return widget.NewSimpleRenderer(a.container)
+}
+
+func (a *AlbumPage) SetPlayAlbumCallback(cb func(string, int)) {
+	a.OnPlayAlbum = cb
+}
+
+func (a *AlbumPage) onPlayTrackAt(tracknum int) {
+	if a.OnPlayAlbum != nil {
+		a.OnPlayAlbum(a.albumID, tracknum)
+	}
+}
+
+func (a *AlbumPage) loadAsync() {
+	go func() {
+		album, err := a.lm.GetAlbum(a.albumID)
+		if err != nil {
+			log.Printf("Failed to get album: %s", err.Error())
+			return
+		}
+		a.titleDisp.Segments[0].(*widget.TextSegment).Text = album.Name
+		a.titleDisp.Refresh()
+		tl := widgets.NewTracklist(album.Song)
+		tl.OnPlayTrackAt = a.onPlayTrackAt
+		a.container.Objects[0] = tl
+		a.container.Refresh()
+	}()
+}

ui/albumspage.go

@@ -25,7 +25,7 @@ type AlbumsPage struct {
 	titleDisp   *widget.RichText
 	sortOrder   *selectWidget
 	container   *fyne.Container
-	OnPlayAlbum func(string)
+	OnPlayAlbum func(string, int)
 }
 
 type selectWidget struct {
@@ -69,6 +69,7 @@ func NewAlbumsPage(title string, sortOrder string, lm *backend.LibraryManager, i
 	a.grid = NewAlbumGrid(iter, im.GetAlbumThumbnail, false /*showYear*/)
 	a.grid.OnPlayAlbum = a.onPlayAlbum
 	a.grid.OnShowArtistPage = a.onShowArtistPage
+	a.grid.OnShowAlbumPage = a.onShowAlbumPage
 	a.container = container.NewBorder(
 		container.NewHBox(widgets.NewHSpace(15), a.titleDisp, sortVbox),
 		nil,
@@ -100,13 +101,13 @@ func (a *AlbumsPage) OnSearched(query string) {
 	a.Refresh()
 }
 
-func (a *AlbumsPage) SetPlayAlbumCallback(cb func(string)) {
+func (a *AlbumsPage) SetPlayAlbumCallback(cb func(string, int)) {
 	a.OnPlayAlbum = cb
 }
 
 func (a *AlbumsPage) onPlayAlbum(albumID string) {
 	if a.OnPlayAlbum != nil {
-		a.OnPlayAlbum(albumID)
+		a.OnPlayAlbum(albumID, 0)
 	}
 }
 
@@ -114,6 +115,10 @@ func (a *AlbumsPage) onShowArtistPage(artistID string) {
 	a.nav(ArtistRoute(artistID))
 }
 
+func (a *AlbumsPage) onShowAlbumPage(albumID string) {
+	a.nav(AlbumRoute(albumID))
+}
+
 func (a *AlbumsPage) onSortOrderChanged(order string) {
 	a.grid.Reset(a.lm.AlbumsIter(backend.AlbumSortOrder(order)))
 	if a.searchText == "" {

ui/artistpage.go

@@ -16,20 +16,23 @@ var _ fyne.Widget = (*ArtistPage)(nil)
 type ArtistPage struct {
 	widget.BaseWidget
 
-	artistID    string
+	artistID  string
-	im          *backend.ImageManager
+	im        *backend.ImageManager
-	sm          *backend.ServerManager
+	sm        *backend.ServerManager
-	grid        *AlbumGrid
+	nav       func(Route)
-	titleDisp   *widget.RichText
+	grid      *AlbumGrid
-	container   *fyne.Container
+	titleDisp *widget.RichText
-	OnPlayAlbum func(string)
+	container *fyne.Container
+
+	OnPlayAlbum func(string, int)
 }
 
-func NewArtistPage(artistID string, sm *backend.ServerManager, im *backend.ImageManager) *ArtistPage {
+func NewArtistPage(artistID string, sm *backend.ServerManager, im *backend.ImageManager, nav func(Route)) *ArtistPage {
 	a := &ArtistPage{
 		artistID: artistID,
 		sm:       sm,
 		im:       im,
+		nav:      nav,
 	}
 	a.ExtendBaseWidget(a)
 	a.titleDisp = widget.NewRichTextWithText("Artist")
@@ -41,16 +44,20 @@ func NewArtistPage(artistID string, sm *backend.ServerManager, im *backend.Image
 	return a
 }
 
-func (a *ArtistPage) SetPlayAlbumCallback(cb func(string)) {
+func (a *ArtistPage) SetPlayAlbumCallback(cb func(string, int)) {
 	a.OnPlayAlbum = cb
 }
 
 func (a *ArtistPage) onPlayAlbum(albumID string) {
 	if a.OnPlayAlbum != nil {
-		a.OnPlayAlbum(albumID)
+		a.OnPlayAlbum(albumID, 0)
 	}
 }
 
+func (a *ArtistPage) onShowAlbumPage(albumID string) {
+	a.nav(AlbumRoute(albumID))
+}
+
 func (a *ArtistPage) loadAsync() {
 	go func() {
 		artist, err := a.sm.Server.GetArtist(a.artistID)
@@ -62,6 +69,7 @@ func (a *ArtistPage) loadAsync() {
 		a.titleDisp.Refresh()
 		ag := NewFixedAlbumGrid(artist.Album, a.im.GetAlbumThumbnail, true /*showYear*/)
 		ag.OnPlayAlbum = a.onPlayAlbum
+		ag.OnShowAlbumPage = a.onShowAlbumPage
 		a.container.Objects[0] = ag
 		a.container.Refresh()
 	}()

ui/browsingpane.go

@@ -21,7 +21,7 @@ type Searchable interface {
 }
 
 type CanPlayAlbum interface {
-	SetPlayAlbumCallback(func(albumID string))
+	SetPlayAlbumCallback(func(albumID string, startingTrack int))
 }
 
 type BrowsingPane struct {
@@ -70,8 +70,8 @@ func (b *BrowsingPane) SetPage(p Page) {
 func (b *BrowsingPane) doSetPage(p Page) {
 	b.curPage = p
 	if pa, ok := p.(CanPlayAlbum); ok {
-		pa.SetPlayAlbumCallback(func(albumID string) {
+		pa.SetPlayAlbumCallback(func(albumID string, firstTrack int) {
-			_ = b.app.PlaybackManager.PlayAlbum(albumID)
+			_ = b.app.PlaybackManager.PlayAlbum(albumID, firstTrack)
 		})
 	}
 	_, s := p.(Searchable)

ui/router.go

@@ -27,6 +27,10 @@ func ArtistRoute(artistID string) Route {
 	return Route{Page: Artist, Arg: artistID}
 }
 
+func AlbumRoute(albumID string) Route {
+	return Route{Page: Album, Arg: albumID}
+}
+
 type NavigationHandler interface {
 	SetPage(Page)
 }
@@ -45,10 +49,12 @@ func NewRouter(app *backend.App, nav NavigationHandler) Router {
 
 func (r Router) CreatePage(rte Route) Page {
 	switch rte.Page {
+	case Album:
+		return NewAlbumPage(rte.Arg, r.App.LibraryManager)
 	case Albums:
 		return NewAlbumsPage("Albums", rte.Arg, r.App.LibraryManager, r.App.ImageManager, r.OpenRoute)
 	case Artist:
-		return NewArtistPage(rte.Arg, r.App.ServerManager, r.App.ImageManager)
+		return NewArtistPage(rte.Arg, r.App.ServerManager, r.App.ImageManager, r.OpenRoute)
 	}
 	return nil
 }

ui/widgets/albumcard.go

@@ -64,7 +64,7 @@ type AlbumCard struct {
 
 	albumID   string
 	artistID  string
-	title     *widget.Label
+	title     *CustomHyperlink
 	artist    *CustomHyperlink
 	year      *widget.Label
 	container *fyne.Container
@@ -91,7 +91,7 @@ func (a *AlbumCard) MouseMoved(*desktop.MouseEvent) {}
 
 func NewAlbumCard(showYear bool) *AlbumCard {
 	a := &AlbumCard{
-		title:    widget.NewLabel(""),
+		title:    NewCustomHyperlink(),
 		artist:   NewCustomHyperlink(),
 		year:     widget.NewLabel(""),
 		Cover:    newAlbumCover(),
@@ -103,13 +103,16 @@ func NewAlbumCard(showYear bool) *AlbumCard {
 			a.OnPlay()
 		}
 	}
+	a.title.OnTapped = func() {
+		if a.OnShowAlbumPage != nil {
+			a.OnShowAlbumPage()
+		}
+	}
 	a.artist.OnTapped = func() {
 		if a.OnShowArtistPage != nil {
 			a.OnShowArtistPage()
 		}
 	}
-	a.title.Wrapping = fyne.TextTruncate
-	a.title.TextStyle = fyne.TextStyle{Bold: true}
 
 	a.createContainer()
 	return a