From 0a902aef9f0165cde30a5ff8bd2c90f8dc700734 Mon Sep 17 00:00:00 2001 From: Drew Weymouth Date: Fri, 31 May 2024 16:37:14 -0700 Subject: [PATCH] refactoring continued - compiles now --- .../jellyfin/jellyfinmediaprovider.go | 2 +- backend/mediaprovider/model.go | 49 ++++++++++++++++--- .../subsonic/subsonicmediaprovider.go | 4 +- backend/mpmedia_mac.go | 12 +++-- backend/mpris.go | 8 +-- backend/playbackengine.go | 38 +++----------- backend/playbackmanager.go | 29 ++--------- backend/savedplayqueue.go | 2 +- sharedutil/sharedutil.go | 16 ++---- ui/bottompanel.go | 27 ++++++---- ui/browsing/albumpage.go | 4 +- ui/browsing/artistpage.go | 6 +-- ui/browsing/browsingpane.go | 4 +- ui/browsing/favoritespage.go | 6 +-- ui/browsing/nowplayingpage.go | 24 ++++----- ui/browsing/playlistpage.go | 4 +- ui/browsing/trackspage.go | 4 +- ui/controller/controller.go | 6 +-- ui/mainwindow.go | 14 ++++-- ui/widgets/largenowplayingcard.go | 19 ++++--- ui/widgets/nowplayingcard.go | 18 ++++--- ui/widgets/playqueuelist.go | 2 +- ui/widgets/tracklist.go | 2 +- ui/widgets/tracklistrow.go | 2 +- 24 files changed, 154 insertions(+), 148 deletions(-) diff --git a/backend/mediaprovider/jellyfin/jellyfinmediaprovider.go b/backend/mediaprovider/jellyfin/jellyfinmediaprovider.go index 9386052..a303e69 100644 --- a/backend/mediaprovider/jellyfin/jellyfinmediaprovider.go +++ b/backend/mediaprovider/jellyfin/jellyfinmediaprovider.go @@ -395,7 +395,7 @@ func toTrack(ch *jellyfin.Song) *mediaprovider.Track { ID: ch.Id, CoverArtID: coverArtID, ParentID: ch.AlbumID, - Name: ch.Name, + Title: ch.Name, Duration: int(ch.RunTimeTicks / runTimeTicksPerSecond), TrackNumber: ch.IndexNumber, DiscNumber: ch.DiscNumber, diff --git a/backend/mediaprovider/model.go b/backend/mediaprovider/model.go index fcb1096..9e7c896 100644 --- a/backend/mediaprovider/model.go +++ b/backend/mediaprovider/model.go @@ -86,7 +86,7 @@ type Track struct { ID string CoverArtID string ParentID string - Name string + Title string Duration int TrackNumber int DiscNumber int @@ -146,21 +146,56 @@ type RadioStation struct { 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 { - MediaItemName() string - MediaItemID() string + Metadata() MediaItemMetadata Copy() MediaItem } -func (t Track) MediaItemName() string { return t.Name } -func (t Track) MediaItemID() string { return t.ID } +func (t Track) Metadata() MediaItemMetadata { + 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 { new := *t return &new } -func (r RadioStation) MediaItemName() string { return r.Name } -func (r RadioStation) MediaItemID() string { return r.ID } +func (r RadioStation) Metadata() MediaItemMetadata { + return MediaItemMetadata{ + Type: MediaItemTypeRadioStation, + ID: r.ID, + Name: r.Name, + } +} + func (r *RadioStation) Copy() MediaItem { return r // no need to copy since RadioStations are immutable } diff --git a/backend/mediaprovider/subsonic/subsonicmediaprovider.go b/backend/mediaprovider/subsonic/subsonicmediaprovider.go index 98b95db..bddffea 100644 --- a/backend/mediaprovider/subsonic/subsonicmediaprovider.go +++ b/backend/mediaprovider/subsonic/subsonicmediaprovider.go @@ -367,7 +367,7 @@ func (s *subsonicMediaProvider) GetLyrics(track *mediaprovider.Track) (*mediapro return mpLyrics, nil } // 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 == "" { return nil, err } @@ -433,7 +433,7 @@ func toTrack(ch *subsonic.Child) *mediaprovider.Track { ID: ch.ID, CoverArtID: ch.CoverArt, ParentID: ch.Parent, - Name: ch.Title, + Title: ch.Title, Duration: ch.Duration, TrackNumber: ch.Track, DiscNumber: ch.DiscNumber, diff --git a/backend/mpmedia_mac.go b/backend/mpmedia_mac.go index b3343ce..3a30c1c 100644 --- a/backend/mpmedia_mac.go +++ b/backend/mpmedia_mac.go @@ -69,9 +69,13 @@ func InitMPMediaHandler(playbackManager *PlaybackManager, artURLLookup func(trac mpMediaEventRecipient = mp 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 - go mp.updateMetadata(track) + var meta mediaprovider.MediaItemMetadata + if track == nil { + meta = track.Metadata() + } + go mp.updateMetadata(&meta) }) mp.playbackManager.OnStopped(func() { @@ -95,11 +99,11 @@ func InitMPMediaHandler(playbackManager *PlaybackManager, artURLLookup func(trac return nil } -func (mp *MPMediaHandler) updateMetadata(meta *NowPlayingMetadata) { +func (mp *MPMediaHandler) updateMetadata(meta *mediaprovider.MediaItemMetadata) { var title, artist, artURL string var duration int if meta != nil && meta.ID != "" { - title = meta.Title + title = meta.Name var err error if artURL, err = mp.artURLLookup(meta.CoverArtID); err != nil { log.Printf("error fetching art url: %s", err.Error()) diff --git a/backend/mpris.go b/backend/mpris.go index 045a2cd..2801e56 100644 --- a/backend/mpris.go +++ b/backend/mpris.go @@ -58,11 +58,11 @@ func NewMPRISHandler(playerName string, pm *PlaybackManager) *MPRISHandler { m.evt.Player.OnSeek(pos) } }) - pm.OnSongChange(func(tr *NowPlayingMetadata, _ *mediaprovider.Track) { + pm.OnSongChange(func(tr mediaprovider.MediaItem, _ *mediaprovider.Track) { if tr == nil { m.curTrackPath = "" } else { - m.curTrackPath = dbusTrackIDPrefix + encodeTrackId(tr.ID) + m.curTrackPath = dbusTrackIDPrefix + encodeTrackId(tr.Metadata().ID) } if m.connErr == nil { m.evt.Player.OnTitle() @@ -252,7 +252,7 @@ func (m *MPRISHandler) Metadata() (types.Metadata, error) { } status := m.pm.PlayerStatus() 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 { tr = *track } @@ -266,7 +266,7 @@ func (m *MPRISHandler) Metadata() (types.Metadata, error) { return types.Metadata{ TrackId: dbus.ObjectPath(trackObjPath), Length: secondsToMicroseconds(status.Duration), - Title: tr.Name, + Title: tr.Title, Album: tr.Album, Artist: tr.ArtistNames, DiscNumber: tr.DiscNumber, diff --git a/backend/playbackengine.go b/backend/playbackengine.go index 0d8f05d..46db90c 100644 --- a/backend/playbackengine.go +++ b/backend/playbackengine.go @@ -60,7 +60,7 @@ type playbackEngine struct { replayGainCfg ReplayGainConfig // registered callbacks - onSongChange []func(nowPlaying *NowPlayingMetadata, justScrobbledIfAny *mediaprovider.Track) + onSongChange []func(nowPlaying mediaprovider.MediaItem, justScrobbledIfAny *mediaprovider.Track) onPlayTimeUpdate []func(float64, float64, bool) onLoopModeChange []func(LoopMode) onVolumeChange []func(int) @@ -122,34 +122,8 @@ func (p *playbackEngine) PlayTrackAt(idx int) error { return p.setTrack(idx, false) } -// Gets the curently playing song, if any. -func (p *playbackEngine) NowPlaying() *NowPlayingMetadata { - 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 { +// Gets the curently playing media item, if any. +func (p *playbackEngine) NowPlaying() mediaprovider.MediaItem { if p.nowPlayingIdx < 0 || len(p.playQueue) == 0 || p.player.GetStatus().State == player.Stopped { return nil } @@ -304,9 +278,9 @@ func (p *playbackEngine) UpdatePlayQueue(tracks []*mediaprovider.Track) error { newQueue := p.copyTrackSliceToMediaItemSlice(tracks) newNowPlayingIdx := -1 if p.nowPlayingIdx >= 0 { - nowPlayingID := p.playQueue[p.nowPlayingIdx].MediaItemID() + nowPlayingID := p.playQueue[p.nowPlayingIdx].Metadata().ID for i, tr := range newQueue { - if tr.MediaItemID() == nowPlayingID { + if tr.Metadata().ID == nowPlayingID { newNowPlayingIdx = i break } @@ -335,7 +309,7 @@ func (p *playbackEngine) RemoveTracksFromQueue(trackIDs []string) { nowPlaying := p.NowPlayingIndex() newNowPlaying := nowPlaying for i, tr := range p.playQueue { - if _, ok := idSet[tr.MediaItemID()]; ok { + if _, ok := idSet[tr.Metadata().ID]; ok { if i < nowPlaying { // 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 diff --git a/backend/playbackmanager.go b/backend/playbackmanager.go index 9ba9eac..4471c8e 100644 --- a/backend/playbackmanager.go +++ b/backend/playbackmanager.go @@ -15,25 +15,6 @@ type PlaybackManager struct { 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( ctx context.Context, s *ServerManager, @@ -64,21 +45,17 @@ func (p *PlaybackManager) DisableCallbacks() { p.engine.callbacksDisabled = true } -// Gets the curently playing song, if any. -func (p *PlaybackManager) NowPlaying() *NowPlayingMetadata { +// Gets the now playing media item, if any. +func (p *PlaybackManager) NowPlaying() mediaprovider.MediaItem { return p.engine.NowPlaying() } -func (p *PlaybackManager) NowPlayingMediaItem() mediaprovider.MediaItem { - return p.engine.NowPlayingMediaItem() -} - func (p *PlaybackManager) NowPlayingIndex() int { return p.engine.NowPlayingIndex() } // 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) } diff --git a/backend/savedplayqueue.go b/backend/savedplayqueue.go index c66e1a7..ad664b9 100644 --- a/backend/savedplayqueue.go +++ b/backend/savedplayqueue.go @@ -33,7 +33,7 @@ func SavePlayQueue(serverID string, pm *PlaybackManager, filepath string, server for _, item := range queue { if _, ok := item.(*mediaprovider.Track); ok { // dont' save radio stations in play queue - trackIDs = append(trackIDs, item.MediaItemID()) + trackIDs = append(trackIDs, item.Metadata().ID) } } diff --git a/sharedutil/sharedutil.go b/sharedutil/sharedutil.go index ef72041..c407783 100644 --- a/sharedutil/sharedutil.go +++ b/sharedutil/sharedutil.go @@ -4,7 +4,6 @@ import ( "math" "slices" - "github.com/dweymouth/supersonic/backend" "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 { for _, tr := range items { - if id == tr.MediaItemID() { + if id == tr.Metadata().ID { return tr } } return nil } -func TrackIDOrEmptyStr(track *mediaprovider.Track) string { - if track == nil { +func MediaItemIDOrEmptyStr(item mediaprovider.MediaItem) string { + if item == nil { return "" } - return track.ID -} - -func TrackIDOremptyStringFromMeta(meta *backend.NowPlayingMetadata) string { - if meta == nil || meta.Type != backend.MediaTypeTrack { - return "" - } - return meta.ID + return item.Metadata().ID } func AlbumIDOrEmptyStr(track *mediaprovider.Track) string { diff --git a/ui/bottompanel.go b/ui/bottompanel.go index 7af0d53..a99de31 100644 --- a/ui/bottompanel.go +++ b/ui/bottompanel.go @@ -56,22 +56,30 @@ func NewBottomPanel(pm *backend.PlaybackManager, contr *controller.Controller) * contr.NavigateTo(controller.NowPlayingRoute("")) } 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) { - 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() { - contr.DoAddTracksToPlaylistWorkflow([]string{pm.NowPlaying().ID}) + if tr, ok := pm.NowPlaying().(*mediaprovider.Track); ok { + contr.DoAddTracksToPlaylistWorkflow([]string{tr.ID}) + } } 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) { contr.NavigateTo(controller.ArtistRoute(artistID)) } 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.OnPlayPause(func() { @@ -102,19 +110,20 @@ func NewBottomPanel(pm *backend.PlaybackManager, contr *controller.Controller) * return bp } -func (bp *BottomPanel) onSongChange(song, _ *mediaprovider.Track) { +func (bp *BottomPanel) onSongChange(song mediaprovider.MediaItem, _ *mediaprovider.Track) { if song == nil { bp.NowPlaying.Update(nil, nil) } else { - bp.coverArtID = song.CoverArtID + meta := song.Metadata() + bp.coverArtID = meta.CoverArtID var im image.Image if bp.ImageManager != nil { // set image to expire not long after the length of the song // 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 // if the user navigates to the album page for the track - imgTTLSec := song.Duration + 30 - im, _ = bp.ImageManager.GetCoverThumbnailWithTTL(song.CoverArtID, time.Duration(imgTTLSec)*time.Second) + imgTTLSec := meta.Duration + 30 + im, _ = bp.ImageManager.GetCoverThumbnailWithTTL(meta.CoverArtID, time.Duration(imgTTLSec)*time.Second) } bp.NowPlaying.Update(song, im) } diff --git a/ui/browsing/albumpage.go b/ui/browsing/albumpage.go index cc6197d..ae4d634 100644 --- a/ui/browsing/albumpage.go +++ b/ui/browsing/albumpage.go @@ -131,9 +131,9 @@ func (a *AlbumPage) Route() controller.Route { } 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.IncrementPlayCount(sharedutil.TrackIDOrEmptyStr(lastScrobbledIfAny)) + a.tracklist.IncrementPlayCount(sharedutil.MediaItemIDOrEmptyStr(lastScrobbledIfAny)) } func (a *AlbumPage) Reload() { diff --git a/ui/browsing/artistpage.go b/ui/browsing/artistpage.go index 35439fd..634e304 100644 --- a/ui/browsing/artistpage.go +++ b/ui/browsing/artistpage.go @@ -139,12 +139,12 @@ func (a *ArtistPage) Save() SavedPage { var _ CanShowNowPlaying = (*ArtistPage)(nil) -func (a *ArtistPage) OnSongChange(track, lastScrobbledIfAny *mediaprovider.Track) { - a.nowPlayingID = sharedutil.TrackIDOrEmptyStr(track) +func (a *ArtistPage) OnSongChange(track mediaprovider.MediaItem, lastScrobbledIfAny *mediaprovider.Track) { + a.nowPlayingID = sharedutil.MediaItemIDOrEmptyStr(track) if a.tracklistCtr != nil { tl := a.tracklistCtr.Objects[0].(*widgets.Tracklist) tl.SetNowPlaying(a.nowPlayingID) - tl.IncrementPlayCount(sharedutil.TrackIDOrEmptyStr(lastScrobbledIfAny)) + tl.IncrementPlayCount(sharedutil.MediaItemIDOrEmptyStr(lastScrobbledIfAny)) } } diff --git a/ui/browsing/browsingpane.go b/ui/browsing/browsingpane.go index 38b0550..4fce17d 100644 --- a/ui/browsing/browsingpane.go +++ b/ui/browsing/browsingpane.go @@ -42,7 +42,7 @@ type Scrollable interface { } type CanShowNowPlaying interface { - OnSongChange(meta *backend.NowPlayingMetadata, lastScrobbledIfAny *mediaprovider.Track) + OnSongChange(playing mediaprovider.MediaItem, lastScrobbledIfAny *mediaprovider.Track) } type CanShowPlayTime interface { @@ -213,7 +213,7 @@ func (b *BrowsingPane) doSetPage(p Page) bool { 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 { return } diff --git a/ui/browsing/favoritespage.go b/ui/browsing/favoritespage.go index a841e4e..a550a3e 100644 --- a/ui/browsing/favoritespage.go +++ b/ui/browsing/favoritespage.go @@ -269,11 +269,11 @@ func (a *FavoritesPage) OnSearched(query string) { var _ CanShowNowPlaying = (*FavoritesPage)(nil) -func (a *FavoritesPage) OnSongChange(meta *backend.NowPlayingMetadata, lastScrobbledIfAny *mediaprovider.Track) { - a.nowPlayingID = sharedutil.TrackIDOrEmptyStr(song) +func (a *FavoritesPage) OnSongChange(item mediaprovider.MediaItem, lastScrobbledIfAny *mediaprovider.Track) { + a.nowPlayingID = sharedutil.MediaItemIDOrEmptyStr(item) if tracklist := a.tracklistOrNil(); tracklist != nil { tracklist.SetNowPlaying(a.nowPlayingID) - tracklist.IncrementPlayCount(sharedutil.TrackIDOrEmptyStr(lastScrobbledIfAny)) + tracklist.IncrementPlayCount(sharedutil.MediaItemIDOrEmptyStr(lastScrobbledIfAny)) } } diff --git a/ui/browsing/nowplayingpage.go b/ui/browsing/nowplayingpage.go index 9e8b113..c182bf8 100644 --- a/ui/browsing/nowplayingpage.go +++ b/ui/browsing/nowplayingpage.go @@ -37,7 +37,7 @@ type NowPlayingPage struct { nowPlayingPageState // volatile state - nowPlaying *mediaprovider.Track + nowPlaying mediaprovider.MediaItem nowPlayingID string curLyricsID string // id of track currently shown in lyrics curRelatedID string // id of track currrently used to populate related list @@ -108,7 +108,7 @@ func NewNowPlayingPage( a.card = widgets.NewLargeNowPlayingCard() 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) { contr.NavigateTo(controller.ArtistRoute(artistID)) @@ -245,12 +245,12 @@ func (a *NowPlayingPage) Route() controller.Route { 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 if a.imageLoadCancel != nil { a.imageLoadCancel() } - a.nowPlayingID = sharedutil.TrackIDOremptyStringFromMeta(song) + a.nowPlayingID = sharedutil.MediaItemIDOrEmptyStr(song) a.queueList.SetNowPlaying(a.nowPlayingID) a.relatedList.SetNowPlaying(a.nowPlayingID) @@ -258,7 +258,7 @@ func (a *NowPlayingPage) OnSongChange(song *backend.NowPlayingMetadata, lastScro if song == nil { a.card.SetCoverImage(nil) } 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*/ { @@ -308,7 +308,7 @@ func (a *NowPlayingPage) updateLyrics() { return } } - if a.nowPlaying == nil { + if a.nowPlaying == nil || a.nowPlaying.Metadata().Type == mediaprovider.MediaItemTypeRadioStation { a.lyricsViewer.SetLyrics(nil) a.curLyricsID = "" return @@ -321,19 +321,20 @@ func (a *NowPlayingPage) updateLyrics() { // to keep it from showing "Lyrics not available" a.lyricsViewer.SetLyrics(&mediaprovider.Lyrics{Synced: true, 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) { var lyrics *mediaprovider.Lyrics var err error 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) } } 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 { log.Println(err.Error()) } @@ -400,7 +401,8 @@ func (a *NowPlayingPage) Reload() { a.relatedList.DisableRating = !a.canRate a.relatedList.DisableSharing = !a.canShare - a.queue = a.pm.GetPlayQueue() + // TODO + //a.queue = a.pm.GetPlayQueue() a.queueList.SetTracks(a.queue) a.totalTime = 0.0 for _, tr := range a.queue { @@ -492,7 +494,7 @@ func (a *NowPlayingPage) formatStatusLine() { dur := 0.0 if np := a.pm.NowPlaying(); np != nil { - dur = float64(np.Duration) + dur = float64(np.Metadata().Duration) } statusSuffix := "" trackNum := 0 diff --git a/ui/browsing/playlistpage.go b/ui/browsing/playlistpage.go index 104e23d..4044fff 100644 --- a/ui/browsing/playlistpage.go +++ b/ui/browsing/playlistpage.go @@ -127,9 +127,9 @@ func (a *PlaylistPage) Route() controller.Route { } 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.IncrementPlayCount(sharedutil.TrackIDOrEmptyStr(lastScrobbledIfAny)) + a.tracklist.IncrementPlayCount(sharedutil.MediaItemIDOrEmptyStr(lastScrobbledIfAny)) } func (a *PlaylistPage) Reload() { diff --git a/ui/browsing/trackspage.go b/ui/browsing/trackspage.go index fea8fdc..d2bc587 100644 --- a/ui/browsing/trackspage.go +++ b/ui/browsing/trackspage.go @@ -96,12 +96,12 @@ func (t *TracksPage) Reload() { } func (t *TracksPage) OnSongChange(track, lastScrobbledIfAny *mediaprovider.Track) { - t.nowPlayingID = sharedutil.TrackIDOrEmptyStr(track) + t.nowPlayingID = sharedutil.MediaItemIDOrEmptyStr(track) t.tracklist.SetNowPlaying(t.nowPlayingID) if t.searchTracklist != nil { t.searchTracklist.SetNowPlaying(t.nowPlayingID) } - playedID := sharedutil.TrackIDOrEmptyStr(lastScrobbledIfAny) + playedID := sharedutil.MediaItemIDOrEmptyStr(lastScrobbledIfAny) t.tracklist.IncrementPlayCount(playedID) if t.searchTracklist != nil { t.searchTracklist.IncrementPlayCount(playedID) diff --git a/ui/controller/controller.go b/ui/controller/controller.go index 95d149c..d62869e 100644 --- a/ui/controller/controller.go +++ b/ui/controller/controller.go @@ -827,8 +827,8 @@ func (c *Controller) downloadTrack(track *mediaprovider.Track, filePath string) return } - log.Printf("Saved song %s to: %s\n", track.Name, filePath) - c.sendNotification(fmt.Sprintf("Download completed: %s", track.Name), fmt.Sprintf("Saved at: %s", filePath)) + log.Printf("Saved song %s to: %s\n", track.Title, 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) { @@ -863,7 +863,7 @@ func (c *Controller) downloadTracks(tracks []*mediaprovider.Track, filePath, dow 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)) diff --git a/ui/mainwindow.go b/ui/mainwindow.go index 51b4fce..adbf867 100644 --- a/ui/mainwindow.go +++ b/ui/mainwindow.go @@ -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.Window.SetContent(m.container) m.Window.Resize(size) - app.PlaybackManager.OnSongChange(func(track, _ *mediaprovider.Track) { - if track == nil { + app.PlaybackManager.OnSongChange(func(item mediaprovider.MediaItem, _ *mediaprovider.Track) { + if item == nil { m.Window.SetTitle(displayAppName) return } - artistDisp := strings.Join(track.ArtistNames, ", ") - m.Window.SetTitle(fmt.Sprintf("%s – %s · %s", track.Name, artistDisp, displayAppName)) + meta := item.Metadata() + 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 { // TODO: Once Fyne issue #2935 is resolved, show album cover fyne.CurrentApp().SendNotification(&fyne.Notification{ - Title: track.Name, + Title: meta.Name, Content: artistDisp, }) } diff --git a/ui/widgets/largenowplayingcard.go b/ui/widgets/largenowplayingcard.go index f2d97fd..cc3ad33 100644 --- a/ui/widgets/largenowplayingcard.go +++ b/ui/widgets/largenowplayingcard.go @@ -108,20 +108,23 @@ func (n *LargeNowPlayingCard) SetDisplayedFavorite(favorite bool) { n.favorite.Refresh() } -func (n *LargeNowPlayingCard) Update(track *mediaprovider.Track) { - if track != 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 { +func (n *LargeNowPlayingCard) Update(item mediaprovider.MediaItem) { + if item == nil { n.trackName.Segments[0].(*widget.TextSegment).Text = "" n.artistName.BuildSegments([]string{}, []string{}) n.albumName.Text = "" n.rating.Rating = 0 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() } diff --git a/ui/widgets/nowplayingcard.go b/ui/widgets/nowplayingcard.go index c097513..e5ae046 100644 --- a/ui/widgets/nowplayingcard.go +++ b/ui/widgets/nowplayingcard.go @@ -119,15 +119,21 @@ func (n *NowPlayingCard) CreateRenderer() fyne.WidgetRenderer { return widget.NewSimpleRenderer(c) } -func (n *NowPlayingCard) Update(track *mediaprovider.Track, cover image.Image) { - if track != nil { - n.trackName.SetText(track.Name) - n.artistName.BuildSegments(track.ArtistNames, track.ArtistIDs) - n.albumName.SetText(track.Album) - } else { +func (n *NowPlayingCard) Update(track mediaprovider.MediaItem, cover image.Image) { + if track == nil { n.trackName.SetText("") n.artistName.BuildSegments([]string{}, []string{}) 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.artistName.Hidden = len(n.artistName.Segments) == 0 diff --git a/ui/widgets/playqueuelist.go b/ui/widgets/playqueuelist.go index 2c9d80f..c402f21 100644 --- a/ui/widgets/playqueuelist.go +++ b/ui/widgets/playqueuelist.go @@ -360,7 +360,7 @@ func (p *PlayQueueListRow) Update(tm *util.TrackListModel, rowNum int) { p.imageLoader.Load(tm.Track.CoverArtID) p.EnsureUnfocused() p.trackID = tr.ID - p.title.Text = tr.Name + p.title.Text = tr.Title p.artist.BuildSegments(tr.ArtistNames, tr.ArtistIDs) p.time.Text = util.SecondsToTimeString(float64(tr.Duration)) changed = true diff --git a/ui/widgets/tracklist.go b/ui/widgets/tracklist.go index bcdd395..d5f5d43 100644 --- a/ui/widgets/tracklist.go +++ b/ui/widgets/tracklist.go @@ -422,7 +422,7 @@ func (t *Tracklist) doSortTracks() { t.tracks = t.tracksOrigOrder } 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: t.stringSort(func(tr *util.TrackListModel) string { return strings.Join(tr.Track.ArtistNames, ", ") }) case ColumnAlbum: diff --git a/ui/widgets/tracklistrow.go b/ui/widgets/tracklistrow.go index 41654cd..0e9bf0f 100644 --- a/ui/widgets/tracklistrow.go +++ b/ui/widgets/tracklistrow.go @@ -261,7 +261,7 @@ func (t *tracklistRowBase) Update(tm *util.TrackListModel, rowNum int) { t.EnsureUnfocused() 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.album.BuildSegments([]string{tr.Album}, []string{tr.AlbumID}) t.dur.Text = util.SecondsToTimeString(float64(tr.Duration))