owen/supersonic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactoring continued - compiles now

Browse Source
This commit is contained in:
Drew Weymouth
2024-05-31 16:37:14 -07:00
parent f67a0c5fc1
commit 0a902aef9f
24 changed files with 154 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/mediaprovider/jellyfin/jellyfinmediaprovider.go
+1 -1
View File
@@ -395,7 +395,7 @@ func toTrack(ch *jellyfin.Song) *mediaprovider.Track {
ID: ch.Id, ID: ch.Id,
CoverArtID: coverArtID, CoverArtID: coverArtID,
ParentID: ch.AlbumID, ParentID: ch.AlbumID,
Name: ch.Name, Title: ch.Name,
Duration: int(ch.RunTimeTicks / runTimeTicksPerSecond), Duration: int(ch.RunTimeTicks / runTimeTicksPerSecond),
TrackNumber: ch.IndexNumber, TrackNumber: ch.IndexNumber,
DiscNumber: ch.DiscNumber, DiscNumber: ch.DiscNumber,
backend/mediaprovider/model.go
+42 -7
View File
@@ -86,7 +86,7 @@ type Track struct {
ID string ID string
CoverArtID string CoverArtID string
ParentID string ParentID string
Name string Title string
Duration int Duration int
TrackNumber int TrackNumber int
DiscNumber int DiscNumber int
@@ -146,21 +146,56 @@ type RadioStation struct {
StreamURL string StreamURL string
} }
type MediaItemType int
const (
MediaItemTypeTrack MediaItemType = iota
MediaItemTypeRadioStation
)
type MediaItemMetadata struct {
Type MediaItemType
ID string
Name string
Artists []string
ArtistIDs []string
Album string
AlbumID string
CoverArtID string
Duration int
}
type MediaItem interface { type MediaItem interface {
MediaItemName() string Metadata() MediaItemMetadata
MediaItemID() string
Copy() MediaItem Copy() MediaItem
} }
func (t Track) MediaItemName() string { return t.Name } func (t Track) Metadata() MediaItemMetadata {
func (t Track) MediaItemID() string { return t.ID } return MediaItemMetadata{
Type: MediaItemTypeTrack,
ID: t.ID,
Name: t.Title,
Artists: t.ArtistNames,
ArtistIDs: t.ArtistIDs,
Album: t.Album,
AlbumID: t.AlbumID,
CoverArtID: t.CoverArtID,
Duration: t.Duration,
}
}
func (t *Track) Copy() MediaItem { func (t *Track) Copy() MediaItem {
new := *t new := *t
return &new return &new
} }
func (r RadioStation) MediaItemName() string { return r.Name } func (r RadioStation) Metadata() MediaItemMetadata {
func (r RadioStation) MediaItemID() string { return r.ID } return MediaItemMetadata{
Type: MediaItemTypeRadioStation,
ID: r.ID,
Name: r.Name,
}
}
func (r *RadioStation) Copy() MediaItem { func (r *RadioStation) Copy() MediaItem {
return r // no need to copy since RadioStations are immutable return r // no need to copy since RadioStations are immutable
} }
backend/mediaprovider/subsonic/subsonicmediaprovider.go
+2 -2
View File
@@ -367,7 +367,7 @@ func (s *subsonicMediaProvider) GetLyrics(track *mediaprovider.Track) (*mediapro
return mpLyrics, nil return mpLyrics, nil
} }
// fallback to legacy getLyrics endpoint // fallback to legacy getLyrics endpoint
lyrics, err := s.client.GetLyrics(track.Name, track.ArtistNames[0]) lyrics, err := s.client.GetLyrics(track.Title, track.ArtistNames[0])
if err != nil || lyrics == nil || lyrics.Text == "" { if err != nil || lyrics == nil || lyrics.Text == "" {
return nil, err return nil, err
} }
@@ -433,7 +433,7 @@ func toTrack(ch *subsonic.Child) *mediaprovider.Track {
ID: ch.ID, ID: ch.ID,
CoverArtID: ch.CoverArt, CoverArtID: ch.CoverArt,
ParentID: ch.Parent, ParentID: ch.Parent,
Name: ch.Title, Title: ch.Title,
Duration: ch.Duration, Duration: ch.Duration,
TrackNumber: ch.Track, TrackNumber: ch.Track,
DiscNumber: ch.DiscNumber, DiscNumber: ch.DiscNumber,
backend/mpmedia_mac.go
+8 -4
View File
@@ -69,9 +69,13 @@ func InitMPMediaHandler(playbackManager *PlaybackManager, artURLLookup func(trac
mpMediaEventRecipient = mp mpMediaEventRecipient = mp
C.register_os_remote_commands() C.register_os_remote_commands()
mp.playbackManager.OnSongChange(func(track *NowPlayingMetadata, _ *mediaprovider.Track) { mp.playbackManager.OnSongChange(func(track mediaprovider.MediaItem, _ *mediaprovider.Track) {
// Asynchronously because artwork fetching can take time // Asynchronously because artwork fetching can take time
go mp.updateMetadata(track) var meta mediaprovider.MediaItemMetadata
if track == nil {
meta = track.Metadata()
}
go mp.updateMetadata(&meta)
}) })
mp.playbackManager.OnStopped(func() { mp.playbackManager.OnStopped(func() {
@@ -95,11 +99,11 @@ func InitMPMediaHandler(playbackManager *PlaybackManager, artURLLookup func(trac
return nil return nil
} }
func (mp *MPMediaHandler) updateMetadata(meta *NowPlayingMetadata) { func (mp *MPMediaHandler) updateMetadata(meta *mediaprovider.MediaItemMetadata) {
var title, artist, artURL string var title, artist, artURL string
var duration int var duration int
if meta != nil && meta.ID != "" { if meta != nil && meta.ID != "" {
title = meta.Title title = meta.Name
var err error var err error
if artURL, err = mp.artURLLookup(meta.CoverArtID); err != nil { if artURL, err = mp.artURLLookup(meta.CoverArtID); err != nil {
log.Printf("error fetching art url: %s", err.Error()) log.Printf("error fetching art url: %s", err.Error())
backend/mpris.go
+4 -4
View File
@@ -58,11 +58,11 @@ func NewMPRISHandler(playerName string, pm *PlaybackManager) *MPRISHandler {
m.evt.Player.OnSeek(pos) m.evt.Player.OnSeek(pos)
} }
}) })
pm.OnSongChange(func(tr *NowPlayingMetadata, _ *mediaprovider.Track) { pm.OnSongChange(func(tr mediaprovider.MediaItem, _ *mediaprovider.Track) {
if tr == nil { if tr == nil {
m.curTrackPath = "" m.curTrackPath = ""
} else { } else {
m.curTrackPath = dbusTrackIDPrefix + encodeTrackId(tr.ID) m.curTrackPath = dbusTrackIDPrefix + encodeTrackId(tr.Metadata().ID)
} }
if m.connErr == nil { if m.connErr == nil {
m.evt.Player.OnTitle() m.evt.Player.OnTitle()
@@ -252,7 +252,7 @@ func (m *MPRISHandler) Metadata() (types.Metadata, error) {
} }
status := m.pm.PlayerStatus() status := m.pm.PlayerStatus()
var tr mediaprovider.Track var tr mediaprovider.Track
if np := m.pm.NowPlayingMediaItem(); np != nil && status.State != player.Stopped { if np := m.pm.NowPlaying(); np != nil && status.State != player.Stopped {
if track, ok := np.(*mediaprovider.Track); ok { if track, ok := np.(*mediaprovider.Track); ok {
tr = *track tr = *track
} }
@@ -266,7 +266,7 @@ func (m *MPRISHandler) Metadata() (types.Metadata, error) {
return types.Metadata{ return types.Metadata{
TrackId: dbus.ObjectPath(trackObjPath), TrackId: dbus.ObjectPath(trackObjPath),
Length: secondsToMicroseconds(status.Duration), Length: secondsToMicroseconds(status.Duration),
Title: tr.Name, Title: tr.Title,
Album: tr.Album, Album: tr.Album,
Artist: tr.ArtistNames, Artist: tr.ArtistNames,
DiscNumber: tr.DiscNumber, DiscNumber: tr.DiscNumber,
backend/playbackengine.go
+6 -32
View File
@@ -60,7 +60,7 @@ type playbackEngine struct {
replayGainCfg ReplayGainConfig replayGainCfg ReplayGainConfig
// registered callbacks // registered callbacks
onSongChange []func(nowPlaying *NowPlayingMetadata, justScrobbledIfAny *mediaprovider.Track) onSongChange []func(nowPlaying mediaprovider.MediaItem, justScrobbledIfAny *mediaprovider.Track)
onPlayTimeUpdate []func(float64, float64, bool) onPlayTimeUpdate []func(float64, float64, bool)
onLoopModeChange []func(LoopMode) onLoopModeChange []func(LoopMode)
onVolumeChange []func(int) onVolumeChange []func(int)
@@ -122,34 +122,8 @@ func (p *playbackEngine) PlayTrackAt(idx int) error {
return p.setTrack(idx, false) return p.setTrack(idx, false)
} }
// Gets the curently playing song, if any. // Gets the curently playing media item, if any.
func (p *playbackEngine) NowPlaying() *NowPlayingMetadata { func (p *playbackEngine) NowPlaying() mediaprovider.MediaItem {
if p.nowPlayingIdx < 0 || len(p.playQueue) == 0 || p.player.GetStatus().State == player.Stopped {
return nil
}
item := p.playQueue[p.nowPlayingIdx]
if tr, ok := item.(*mediaprovider.Track); ok {
return &NowPlayingMetadata{
Type: MediaTypeTrack,
ID: tr.ID,
Title: tr.Name,
Artists: tr.ArtistNames,
ArtistIDs: tr.ArtistIDs,
Album: tr.Album,
AlbumID: tr.AlbumID,
Duration: float64(tr.Duration),
}
}
return &NowPlayingMetadata{
Type: MediaTypeRadioStation,
ID: item.MediaItemID(),
Title: item.MediaItemName(),
Duration: 0.0,
}
}
// Gets the curently playing song, if any.
func (p *playbackEngine) NowPlayingMediaItem() mediaprovider.MediaItem {
if p.nowPlayingIdx < 0 || len(p.playQueue) == 0 || p.player.GetStatus().State == player.Stopped { if p.nowPlayingIdx < 0 || len(p.playQueue) == 0 || p.player.GetStatus().State == player.Stopped {
return nil return nil
} }
@@ -304,9 +278,9 @@ func (p *playbackEngine) UpdatePlayQueue(tracks []*mediaprovider.Track) error {
newQueue := p.copyTrackSliceToMediaItemSlice(tracks) newQueue := p.copyTrackSliceToMediaItemSlice(tracks)
newNowPlayingIdx := -1 newNowPlayingIdx := -1
if p.nowPlayingIdx >= 0 { if p.nowPlayingIdx >= 0 {
nowPlayingID := p.playQueue[p.nowPlayingIdx].MediaItemID() nowPlayingID := p.playQueue[p.nowPlayingIdx].Metadata().ID
for i, tr := range newQueue { for i, tr := range newQueue {
if tr.MediaItemID() == nowPlayingID { if tr.Metadata().ID == nowPlayingID {
newNowPlayingIdx = i newNowPlayingIdx = i
break break
} }
@@ -335,7 +309,7 @@ func (p *playbackEngine) RemoveTracksFromQueue(trackIDs []string) {
nowPlaying := p.NowPlayingIndex() nowPlaying := p.NowPlayingIndex()
newNowPlaying := nowPlaying newNowPlaying := nowPlaying
for i, tr := range p.playQueue { for i, tr := range p.playQueue {
if _, ok := idSet[tr.MediaItemID()]; ok { if _, ok := idSet[tr.Metadata().ID]; ok {
if i < nowPlaying { if i < nowPlaying {
// if removing a track earlier than the currently playing one (if any), // if removing a track earlier than the currently playing one (if any),
// decrement new now playing index by one to account for new position in queue // decrement new now playing index by one to account for new position in queue
backend/playbackmanager.go
+3 -26
View File
@@ -15,25 +15,6 @@ type PlaybackManager struct {
engine *playbackEngine engine *playbackEngine
} }
type MediaType int
const (
MediaTypeTrack MediaType = iota
MediaTypeRadioStation
)
type NowPlayingMetadata struct {
Type MediaType
ID string
Title string
Artists []string
ArtistIDs []string
Album string
AlbumID string
CoverArtID string
Duration int
}
func NewPlaybackManager( func NewPlaybackManager(
ctx context.Context, ctx context.Context,
s *ServerManager, s *ServerManager,
@@ -64,21 +45,17 @@ func (p *PlaybackManager) DisableCallbacks() {
p.engine.callbacksDisabled = true p.engine.callbacksDisabled = true
} }
// Gets the curently playing song, if any. // Gets the now playing media item, if any.
func (p *PlaybackManager) NowPlaying() *NowPlayingMetadata { func (p *PlaybackManager) NowPlaying() mediaprovider.MediaItem {
return p.engine.NowPlaying() return p.engine.NowPlaying()
} }
func (p *PlaybackManager) NowPlayingMediaItem() mediaprovider.MediaItem {
return p.engine.NowPlayingMediaItem()
}
func (p *PlaybackManager) NowPlayingIndex() int { func (p *PlaybackManager) NowPlayingIndex() int {
return p.engine.NowPlayingIndex() return p.engine.NowPlayingIndex()
} }
// Sets a callback that is notified whenever a new song begins playing. // Sets a callback that is notified whenever a new song begins playing.
func (p *PlaybackManager) OnSongChange(cb func(nowPlaying *NowPlayingMetadata, justScrobbledIfAny *mediaprovider.Track)) { func (p *PlaybackManager) OnSongChange(cb func(nowPlaying mediaprovider.MediaItem, justScrobbledIfAny *mediaprovider.Track)) {
p.engine.onSongChange = append(p.engine.onSongChange, cb) p.engine.onSongChange = append(p.engine.onSongChange, cb)
} }
backend/savedplayqueue.go
+1 -1
View File
@@ -33,7 +33,7 @@ func SavePlayQueue(serverID string, pm *PlaybackManager, filepath string, server
for _, item := range queue { for _, item := range queue {
if _, ok := item.(*mediaprovider.Track); ok { if _, ok := item.(*mediaprovider.Track); ok {
// dont' save radio stations in play queue // dont' save radio stations in play queue
trackIDs = append(trackIDs, item.MediaItemID()) trackIDs = append(trackIDs, item.Metadata().ID)
} }
} }
sharedutil/sharedutil.go
+4 -12
View File
@@ -4,7 +4,6 @@ import (
"math" "math"
"slices" "slices"
"github.com/dweymouth/supersonic/backend"
"github.com/dweymouth/supersonic/backend/mediaprovider" "github.com/dweymouth/supersonic/backend/mediaprovider"
) )
@@ -77,25 +76,18 @@ func FindTrackByID(id string, tracks []*mediaprovider.Track) *mediaprovider.Trac
func FindMediaItemByID(id string, items []mediaprovider.MediaItem) mediaprovider.MediaItem { func FindMediaItemByID(id string, items []mediaprovider.MediaItem) mediaprovider.MediaItem {
for _, tr := range items { for _, tr := range items {
if id == tr.MediaItemID() { if id == tr.Metadata().ID {
return tr return tr
} }
} }
return nil return nil
} }
func TrackIDOrEmptyStr(track *mediaprovider.Track) string { func MediaItemIDOrEmptyStr(item mediaprovider.MediaItem) string {
if track == nil { if item == nil {
return "" return ""
} }
return track.ID return item.Metadata().ID
}
func TrackIDOremptyStringFromMeta(meta *backend.NowPlayingMetadata) string {
if meta == nil || meta.Type != backend.MediaTypeTrack {
return ""
}
return meta.ID
} }
func AlbumIDOrEmptyStr(track *mediaprovider.Track) string { func AlbumIDOrEmptyStr(track *mediaprovider.Track) string {
ui/bottompanel.go
+18 -9
View File
@@ -56,22 +56,30 @@ func NewBottomPanel(pm *backend.PlaybackManager, contr *controller.Controller) *
contr.NavigateTo(controller.NowPlayingRoute("")) contr.NavigateTo(controller.NowPlayingRoute(""))
} }
bp.NowPlaying.OnSetFavorite = func(fav bool) { bp.NowPlaying.OnSetFavorite = func(fav bool) {
contr.SetTrackFavorites([]string{pm.NowPlaying().ID}, fav) if tr, ok := pm.NowPlaying().(*mediaprovider.Track); ok {
contr.SetTrackFavorites([]string{tr.ID}, fav)
}
} }
bp.NowPlaying.OnSetRating = func(rating int) { bp.NowPlaying.OnSetRating = func(rating int) {
contr.SetTrackRatings([]string{pm.NowPlaying().ID}, rating) if tr, ok := pm.NowPlaying().(*mediaprovider.Track); ok {
contr.SetTrackRatings([]string{tr.ID}, rating)
}
} }
bp.NowPlaying.OnAddToPlaylist = func() { bp.NowPlaying.OnAddToPlaylist = func() {
contr.DoAddTracksToPlaylistWorkflow([]string{pm.NowPlaying().ID}) if tr, ok := pm.NowPlaying().(*mediaprovider.Track); ok {
contr.DoAddTracksToPlaylistWorkflow([]string{tr.ID})
}
} }
bp.NowPlaying.OnAlbumNameTapped = func() { bp.NowPlaying.OnAlbumNameTapped = func() {
contr.NavigateTo(controller.AlbumRoute(pm.NowPlaying().AlbumID)) if tr, ok := pm.NowPlaying().(*mediaprovider.Track); ok {
contr.NavigateTo(controller.AlbumRoute(tr.AlbumID))
}
} }
bp.NowPlaying.OnArtistNameTapped = func(artistID string) { bp.NowPlaying.OnArtistNameTapped = func(artistID string) {
contr.NavigateTo(controller.ArtistRoute(artistID)) contr.NavigateTo(controller.ArtistRoute(artistID))
} }
bp.NowPlaying.OnTrackNameTapped = func() { bp.NowPlaying.OnTrackNameTapped = func() {
contr.NavigateTo(controller.NowPlayingRoute(pm.NowPlaying().ID)) contr.NavigateTo(controller.NowPlayingRoute(pm.NowPlaying().Metadata().ID))
} }
bp.Controls = widgets.NewPlayerControls() bp.Controls = widgets.NewPlayerControls()
bp.Controls.OnPlayPause(func() { bp.Controls.OnPlayPause(func() {
@@ -102,19 +110,20 @@ func NewBottomPanel(pm *backend.PlaybackManager, contr *controller.Controller) *
return bp return bp
} }
func (bp *BottomPanel) onSongChange(song, _ *mediaprovider.Track) { func (bp *BottomPanel) onSongChange(song mediaprovider.MediaItem, _ *mediaprovider.Track) {
if song == nil { if song == nil {
bp.NowPlaying.Update(nil, nil) bp.NowPlaying.Update(nil, nil)
} else { } else {
bp.coverArtID = song.CoverArtID meta := song.Metadata()
bp.coverArtID = meta.CoverArtID
var im image.Image var im image.Image
if bp.ImageManager != nil { if bp.ImageManager != nil {
// set image to expire not long after the length of the song // set image to expire not long after the length of the song
// if song is played through without much pausing, image will still // if song is played through without much pausing, image will still
// be in cache for the next song if it's from the same album, or // be in cache for the next song if it's from the same album, or
// if the user navigates to the album page for the track // if the user navigates to the album page for the track
imgTTLSec := song.Duration + 30 imgTTLSec := meta.Duration + 30
im, _ = bp.ImageManager.GetCoverThumbnailWithTTL(song.CoverArtID, time.Duration(imgTTLSec)*time.Second) im, _ = bp.ImageManager.GetCoverThumbnailWithTTL(meta.CoverArtID, time.Duration(imgTTLSec)*time.Second)
} }
bp.NowPlaying.Update(song, im) bp.NowPlaying.Update(song, im)
} }
ui/browsing/albumpage.go
+2 -2
View File
@@ -131,9 +131,9 @@ func (a *AlbumPage) Route() controller.Route {
} }
func (a *AlbumPage) OnSongChange(track, lastScrobbledIfAny *mediaprovider.Track) { func (a *AlbumPage) OnSongChange(track, lastScrobbledIfAny *mediaprovider.Track) {
a.nowPlayingID = sharedutil.TrackIDOrEmptyStr(track) a.nowPlayingID = sharedutil.MediaItemIDOrEmptyStr(track)
a.tracklist.SetNowPlaying(a.nowPlayingID) a.tracklist.SetNowPlaying(a.nowPlayingID)
a.tracklist.IncrementPlayCount(sharedutil.TrackIDOrEmptyStr(lastScrobbledIfAny)) a.tracklist.IncrementPlayCount(sharedutil.MediaItemIDOrEmptyStr(lastScrobbledIfAny))
} }
func (a *AlbumPage) Reload() { func (a *AlbumPage) Reload() {
ui/browsing/artistpage.go
+3 -3
View File
@@ -139,12 +139,12 @@ func (a *ArtistPage) Save() SavedPage {
var _ CanShowNowPlaying = (*ArtistPage)(nil) var _ CanShowNowPlaying = (*ArtistPage)(nil)
func (a *ArtistPage) OnSongChange(track, lastScrobbledIfAny *mediaprovider.Track) { func (a *ArtistPage) OnSongChange(track mediaprovider.MediaItem, lastScrobbledIfAny *mediaprovider.Track) {
a.nowPlayingID = sharedutil.TrackIDOrEmptyStr(track) a.nowPlayingID = sharedutil.MediaItemIDOrEmptyStr(track)
if a.tracklistCtr != nil { if a.tracklistCtr != nil {
tl := a.tracklistCtr.Objects[0].(*widgets.Tracklist) tl := a.tracklistCtr.Objects[0].(*widgets.Tracklist)
tl.SetNowPlaying(a.nowPlayingID) tl.SetNowPlaying(a.nowPlayingID)
tl.IncrementPlayCount(sharedutil.TrackIDOrEmptyStr(lastScrobbledIfAny)) tl.IncrementPlayCount(sharedutil.MediaItemIDOrEmptyStr(lastScrobbledIfAny))
} }
} }
ui/browsing/browsingpane.go
+2 -2
View File
@@ -42,7 +42,7 @@ type Scrollable interface {
} }
type CanShowNowPlaying interface { type CanShowNowPlaying interface {
OnSongChange(meta *backend.NowPlayingMetadata, lastScrobbledIfAny *mediaprovider.Track) OnSongChange(playing mediaprovider.MediaItem, lastScrobbledIfAny *mediaprovider.Track)
} }
type CanShowPlayTime interface { type CanShowPlayTime interface {
@@ -213,7 +213,7 @@ func (b *BrowsingPane) doSetPage(p Page) bool {
return true return true
} }
func (b *BrowsingPane) onSongChange(song *backend.NowPlayingMetadata, lastScrobbledIfAny *mediaprovider.Track) { func (b *BrowsingPane) onSongChange(song mediaprovider.MediaItem, lastScrobbledIfAny *mediaprovider.Track) {
if b.curPage == nil { if b.curPage == nil {
return return
} }
ui/browsing/favoritespage.go
+3 -3
View File
@@ -269,11 +269,11 @@ func (a *FavoritesPage) OnSearched(query string) {
var _ CanShowNowPlaying = (*FavoritesPage)(nil) var _ CanShowNowPlaying = (*FavoritesPage)(nil)
func (a *FavoritesPage) OnSongChange(meta *backend.NowPlayingMetadata, lastScrobbledIfAny *mediaprovider.Track) { func (a *FavoritesPage) OnSongChange(item mediaprovider.MediaItem, lastScrobbledIfAny *mediaprovider.Track) {
a.nowPlayingID = sharedutil.TrackIDOrEmptyStr(song) a.nowPlayingID = sharedutil.MediaItemIDOrEmptyStr(item)
if tracklist := a.tracklistOrNil(); tracklist != nil { if tracklist := a.tracklistOrNil(); tracklist != nil {
tracklist.SetNowPlaying(a.nowPlayingID) tracklist.SetNowPlaying(a.nowPlayingID)
tracklist.IncrementPlayCount(sharedutil.TrackIDOrEmptyStr(lastScrobbledIfAny)) tracklist.IncrementPlayCount(sharedutil.MediaItemIDOrEmptyStr(lastScrobbledIfAny))
} }
} }
ui/browsing/nowplayingpage.go
+13 -11
View File
@@ -37,7 +37,7 @@ type NowPlayingPage struct {
nowPlayingPageState nowPlayingPageState
// volatile state // volatile state
nowPlaying *mediaprovider.Track nowPlaying mediaprovider.MediaItem
nowPlayingID string nowPlayingID string
curLyricsID string // id of track currently shown in lyrics curLyricsID string // id of track currently shown in lyrics
curRelatedID string // id of track currrently used to populate related list curRelatedID string // id of track currrently used to populate related list
@@ -108,7 +108,7 @@ func NewNowPlayingPage(
a.card = widgets.NewLargeNowPlayingCard() a.card = widgets.NewLargeNowPlayingCard()
a.card.OnAlbumNameTapped = func() { a.card.OnAlbumNameTapped = func() {
contr.NavigateTo(controller.AlbumRoute(sharedutil.AlbumIDOrEmptyStr(a.nowPlaying))) contr.NavigateTo(controller.AlbumRoute(a.nowPlaying.Metadata().AlbumID))
} }
a.card.OnArtistNameTapped = func(artistID string) { a.card.OnArtistNameTapped = func(artistID string) {
contr.NavigateTo(controller.ArtistRoute(artistID)) contr.NavigateTo(controller.ArtistRoute(artistID))
@@ -245,12 +245,12 @@ func (a *NowPlayingPage) Route() controller.Route {
var _ CanShowNowPlaying = (*NowPlayingPage)(nil) var _ CanShowNowPlaying = (*NowPlayingPage)(nil)
func (a *NowPlayingPage) OnSongChange(song *backend.NowPlayingMetadata, lastScrobbledIfAny *mediaprovider.Track) { func (a *NowPlayingPage) OnSongChange(song mediaprovider.MediaItem, lastScrobbledIfAny *mediaprovider.Track) {
a.nowPlaying = song a.nowPlaying = song
if a.imageLoadCancel != nil { if a.imageLoadCancel != nil {
a.imageLoadCancel() a.imageLoadCancel()
} }
a.nowPlayingID = sharedutil.TrackIDOremptyStringFromMeta(song) a.nowPlayingID = sharedutil.MediaItemIDOrEmptyStr(song)
a.queueList.SetNowPlaying(a.nowPlayingID) a.queueList.SetNowPlaying(a.nowPlayingID)
a.relatedList.SetNowPlaying(a.nowPlayingID) a.relatedList.SetNowPlaying(a.nowPlayingID)
@@ -258,7 +258,7 @@ func (a *NowPlayingPage) OnSongChange(song *backend.NowPlayingMetadata, lastScro
if song == nil { if song == nil {
a.card.SetCoverImage(nil) a.card.SetCoverImage(nil)
} else { } else {
a.imageLoadCancel = a.im.GetFullSizeCoverArtAsync(song.CoverArtID, a.onImageLoaded) a.imageLoadCancel = a.im.GetFullSizeCoverArtAsync(song.Metadata().CoverArtID, a.onImageLoaded)
} }
if a.tabs != nil && a.tabs.SelectedIndex() == 1 /*lyrics*/ { if a.tabs != nil && a.tabs.SelectedIndex() == 1 /*lyrics*/ {
@@ -308,7 +308,7 @@ func (a *NowPlayingPage) updateLyrics() {
return return
} }
} }
if a.nowPlaying == nil { if a.nowPlaying == nil || a.nowPlaying.Metadata().Type == mediaprovider.MediaItemTypeRadioStation {
a.lyricsViewer.SetLyrics(nil) a.lyricsViewer.SetLyrics(nil)
a.curLyricsID = "" a.curLyricsID = ""
return return
@@ -321,19 +321,20 @@ func (a *NowPlayingPage) updateLyrics() {
// to keep it from showing "Lyrics not available" // to keep it from showing "Lyrics not available"
a.lyricsViewer.SetLyrics(&mediaprovider.Lyrics{Synced: true, a.lyricsViewer.SetLyrics(&mediaprovider.Lyrics{Synced: true,
Lines: []mediaprovider.LyricLine{{Text: ""}}}) Lines: []mediaprovider.LyricLine{{Text: ""}}})
go a.fetchLyrics(ctx, a.nowPlaying) tr, _ := a.nowPlaying.(*mediaprovider.Track)
go a.fetchLyrics(ctx, tr)
} }
func (a *NowPlayingPage) fetchLyrics(ctx context.Context, song *mediaprovider.Track) { func (a *NowPlayingPage) fetchLyrics(ctx context.Context, song *mediaprovider.Track) {
var lyrics *mediaprovider.Lyrics var lyrics *mediaprovider.Lyrics
var err error var err error
if lp, ok := a.sm.Server.(mediaprovider.LyricsProvider); ok { if lp, ok := a.sm.Server.(mediaprovider.LyricsProvider); ok {
if lyrics, err = lp.GetLyrics(a.nowPlaying); err != nil { if lyrics, err = lp.GetLyrics(song); err != nil {
log.Printf("Error fetching lyrics: %v", err) log.Printf("Error fetching lyrics: %v", err)
} }
} }
if lyrics == nil { if lyrics == nil {
lyrics, err = backend.FetchLrcLibLyrics(song.Name, song.ArtistNames[0], song.Album, song.Duration) lyrics, err = backend.FetchLrcLibLyrics(song.Title, song.ArtistNames[0], song.Album, song.Duration)
if err != nil { if err != nil {
log.Println(err.Error()) log.Println(err.Error())
} }
@@ -400,7 +401,8 @@ func (a *NowPlayingPage) Reload() {
a.relatedList.DisableRating = !a.canRate a.relatedList.DisableRating = !a.canRate
a.relatedList.DisableSharing = !a.canShare a.relatedList.DisableSharing = !a.canShare
a.queue = a.pm.GetPlayQueue() // TODO
//a.queue = a.pm.GetPlayQueue()
a.queueList.SetTracks(a.queue) a.queueList.SetTracks(a.queue)
a.totalTime = 0.0 a.totalTime = 0.0
for _, tr := range a.queue { for _, tr := range a.queue {
@@ -492,7 +494,7 @@ func (a *NowPlayingPage) formatStatusLine() {
dur := 0.0 dur := 0.0
if np := a.pm.NowPlaying(); np != nil { if np := a.pm.NowPlaying(); np != nil {
dur = float64(np.Duration) dur = float64(np.Metadata().Duration)
} }
statusSuffix := "" statusSuffix := ""
trackNum := 0 trackNum := 0
ui/browsing/playlistpage.go
+2 -2
View File
@@ -127,9 +127,9 @@ func (a *PlaylistPage) Route() controller.Route {
} }
func (a *PlaylistPage) OnSongChange(track, lastScrobbledIfAny *mediaprovider.Track) { func (a *PlaylistPage) OnSongChange(track, lastScrobbledIfAny *mediaprovider.Track) {
a.nowPlayingID = sharedutil.TrackIDOrEmptyStr(track) a.nowPlayingID = sharedutil.MediaItemIDOrEmptyStr(track)
a.tracklist.SetNowPlaying(a.nowPlayingID) a.tracklist.SetNowPlaying(a.nowPlayingID)
a.tracklist.IncrementPlayCount(sharedutil.TrackIDOrEmptyStr(lastScrobbledIfAny)) a.tracklist.IncrementPlayCount(sharedutil.MediaItemIDOrEmptyStr(lastScrobbledIfAny))
} }
func (a *PlaylistPage) Reload() { func (a *PlaylistPage) Reload() {
ui/browsing/trackspage.go
+2 -2
View File
@@ -96,12 +96,12 @@ func (t *TracksPage) Reload() {
} }
func (t *TracksPage) OnSongChange(track, lastScrobbledIfAny *mediaprovider.Track) { func (t *TracksPage) OnSongChange(track, lastScrobbledIfAny *mediaprovider.Track) {
t.nowPlayingID = sharedutil.TrackIDOrEmptyStr(track) t.nowPlayingID = sharedutil.MediaItemIDOrEmptyStr(track)
t.tracklist.SetNowPlaying(t.nowPlayingID) t.tracklist.SetNowPlaying(t.nowPlayingID)
if t.searchTracklist != nil { if t.searchTracklist != nil {
t.searchTracklist.SetNowPlaying(t.nowPlayingID) t.searchTracklist.SetNowPlaying(t.nowPlayingID)
} }
playedID := sharedutil.TrackIDOrEmptyStr(lastScrobbledIfAny) playedID := sharedutil.MediaItemIDOrEmptyStr(lastScrobbledIfAny)
t.tracklist.IncrementPlayCount(playedID) t.tracklist.IncrementPlayCount(playedID)
if t.searchTracklist != nil { if t.searchTracklist != nil {
t.searchTracklist.IncrementPlayCount(playedID) t.searchTracklist.IncrementPlayCount(playedID)
ui/controller/controller.go
+3 -3
View File
@@ -827,8 +827,8 @@ func (c *Controller) downloadTrack(track *mediaprovider.Track, filePath string)
return return
} }
log.Printf("Saved song %s to: %s\n", track.Name, filePath) log.Printf("Saved song %s to: %s\n", track.Title, filePath)
c.sendNotification(fmt.Sprintf("Download completed: %s", track.Name), fmt.Sprintf("Saved at: %s", filePath)) c.sendNotification(fmt.Sprintf("Download completed: %s", track.Title), fmt.Sprintf("Saved at: %s", filePath))
} }
func (c *Controller) downloadTracks(tracks []*mediaprovider.Track, filePath, downloadName string) { func (c *Controller) downloadTracks(tracks []*mediaprovider.Track, filePath, downloadName string) {
@@ -863,7 +863,7 @@ func (c *Controller) downloadTracks(tracks []*mediaprovider.Track, filePath, dow
continue continue
} }
log.Printf("Saved song %s to: %s\n", track.Name, filePath) log.Printf("Saved song %s to: %s\n", track.Title, filePath)
} }
c.sendNotification(fmt.Sprintf("Download completed: %s", downloadName), fmt.Sprintf("Saved at: %s", filePath)) c.sendNotification(fmt.Sprintf("Download completed: %s", downloadName), fmt.Sprintf("Saved at: %s", filePath))
ui/mainwindow.go
+9 -5
View File
@@ -86,17 +86,21 @@ func NewMainWindow(fyneApp fyne.App, appName, displayAppName, appVersion string,
m.container = container.NewBorder(nil, m.BottomPanel, nil, nil, m.BrowsingPane) m.container = container.NewBorder(nil, m.BottomPanel, nil, nil, m.BrowsingPane)
m.Window.SetContent(m.container) m.Window.SetContent(m.container)
m.Window.Resize(size) m.Window.Resize(size)
app.PlaybackManager.OnSongChange(func(track, _ *mediaprovider.Track) { app.PlaybackManager.OnSongChange(func(item mediaprovider.MediaItem, _ *mediaprovider.Track) {
if track == nil { if item == nil {
m.Window.SetTitle(displayAppName) m.Window.SetTitle(displayAppName)
return return
} }
artistDisp := strings.Join(track.ArtistNames, ", ") meta := item.Metadata()
m.Window.SetTitle(fmt.Sprintf("%s – %s · %s", track.Name, artistDisp, displayAppName)) artistDisp := ""
if tr, ok := item.(*mediaprovider.Track); ok {
artistDisp = strings.Join(tr.ArtistNames, ", ")
}
m.Window.SetTitle(fmt.Sprintf("%s – %s · %s", meta.Name, artistDisp, displayAppName))
if m.App.Config.Application.ShowTrackChangeNotification { if m.App.Config.Application.ShowTrackChangeNotification {
// TODO: Once Fyne issue #2935 is resolved, show album cover // TODO: Once Fyne issue #2935 is resolved, show album cover
fyne.CurrentApp().SendNotification(&fyne.Notification{ fyne.CurrentApp().SendNotification(&fyne.Notification{
Title: track.Name, Title: meta.Name,
Content: artistDisp, Content: artistDisp,
}) })
} }
ui/widgets/largenowplayingcard.go
+11 -8
View File
@@ -108,20 +108,23 @@ func (n *LargeNowPlayingCard) SetDisplayedFavorite(favorite bool) {
n.favorite.Refresh() n.favorite.Refresh()
} }
func (n *LargeNowPlayingCard) Update(track *mediaprovider.Track) { func (n *LargeNowPlayingCard) Update(item mediaprovider.MediaItem) {
if track != nil { if item == nil {
n.trackName.Segments[0].(*widget.TextSegment).Text = track.Name
n.artistName.BuildSegments(track.ArtistNames, track.ArtistIDs)
n.albumName.Text = track.Album
n.rating.Rating = track.Rating
n.favorite.Favorite = track.Favorite
} else {
n.trackName.Segments[0].(*widget.TextSegment).Text = "" n.trackName.Segments[0].(*widget.TextSegment).Text = ""
n.artistName.BuildSegments([]string{}, []string{}) n.artistName.BuildSegments([]string{}, []string{})
n.albumName.Text = "" n.albumName.Text = ""
n.rating.Rating = 0 n.rating.Rating = 0
n.favorite.Favorite = false n.favorite.Favorite = false
} }
meta := item.Metadata()
n.trackName.Segments[0].(*widget.TextSegment).Text = meta.Name
if tr, ok := item.(*mediaprovider.Track); ok {
n.artistName.BuildSegments(tr.ArtistNames, tr.ArtistIDs)
n.albumName.Text = tr.Album
n.rating.Rating = tr.Rating
n.favorite.Favorite = tr.Favorite
}
n.Refresh() n.Refresh()
} }
ui/widgets/nowplayingcard.go
+12 -6
View File
@@ -119,15 +119,21 @@ func (n *NowPlayingCard) CreateRenderer() fyne.WidgetRenderer {
return widget.NewSimpleRenderer(c) return widget.NewSimpleRenderer(c)
} }
func (n *NowPlayingCard) Update(track *mediaprovider.Track, cover image.Image) { func (n *NowPlayingCard) Update(track mediaprovider.MediaItem, cover image.Image) {
if track != nil { if track == nil {
n.trackName.SetText(track.Name)
n.artistName.BuildSegments(track.ArtistNames, track.ArtistIDs)
n.albumName.SetText(track.Album)
} else {
n.trackName.SetText("") n.trackName.SetText("")
n.artistName.BuildSegments([]string{}, []string{}) n.artistName.BuildSegments([]string{}, []string{})
n.albumName.SetText("") n.albumName.SetText("")
} else {
n.trackName.SetText(track.Metadata().Name)
if tr, ok := track.(*mediaprovider.Track); ok {
n.artistName.BuildSegments(tr.ArtistNames, tr.ArtistIDs)
n.albumName.SetText(tr.Album)
} else {
n.artistName.BuildSegments([]string{}, []string{})
n.albumName.SetText("")
}
} }
n.trackName.Hidden = n.trackName.Text == "" n.trackName.Hidden = n.trackName.Text == ""
n.artistName.Hidden = len(n.artistName.Segments) == 0 n.artistName.Hidden = len(n.artistName.Segments) == 0
ui/widgets/playqueuelist.go
+1 -1
View File
@@ -360,7 +360,7 @@ func (p *PlayQueueListRow) Update(tm *util.TrackListModel, rowNum int) {
p.imageLoader.Load(tm.Track.CoverArtID) p.imageLoader.Load(tm.Track.CoverArtID)
p.EnsureUnfocused() p.EnsureUnfocused()
p.trackID = tr.ID p.trackID = tr.ID
p.title.Text = tr.Name p.title.Text = tr.Title
p.artist.BuildSegments(tr.ArtistNames, tr.ArtistIDs) p.artist.BuildSegments(tr.ArtistNames, tr.ArtistIDs)
p.time.Text = util.SecondsToTimeString(float64(tr.Duration)) p.time.Text = util.SecondsToTimeString(float64(tr.Duration))
changed = true changed = true
ui/widgets/tracklist.go
+1 -1
View File
@@ -422,7 +422,7 @@ func (t *Tracklist) doSortTracks() {
t.tracks = t.tracksOrigOrder t.tracks = t.tracksOrigOrder
} }
case ColumnTitle: case ColumnTitle:
t.stringSort(func(tr *util.TrackListModel) string { return tr.Track.Name }) t.stringSort(func(tr *util.TrackListModel) string { return tr.Track.Title })
case ColumnArtist: case ColumnArtist:
t.stringSort(func(tr *util.TrackListModel) string { return strings.Join(tr.Track.ArtistNames, ", ") }) t.stringSort(func(tr *util.TrackListModel) string { return strings.Join(tr.Track.ArtistNames, ", ") })
case ColumnAlbum: case ColumnAlbum:
ui/widgets/tracklistrow.go
+1 -1
View File
@@ -261,7 +261,7 @@ func (t *tracklistRowBase) Update(tm *util.TrackListModel, rowNum int) {
t.EnsureUnfocused() t.EnsureUnfocused()
t.trackID = tr.ID t.trackID = tr.ID
t.name.Segments[0].(*widget.TextSegment).Text = tr.Name t.name.Segments[0].(*widget.TextSegment).Text = tr.Title
t.artist.BuildSegments(tr.ArtistNames, tr.ArtistIDs) t.artist.BuildSegments(tr.ArtistNames, tr.ArtistIDs)
t.album.BuildSegments([]string{tr.Album}, []string{tr.AlbumID}) t.album.BuildSegments([]string{tr.Album}, []string{tr.AlbumID})
t.dur.Text = util.SecondsToTimeString(float64(tr.Duration)) t.dur.Text = util.SecondsToTimeString(float64(tr.Duration))