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
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) {
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() {
ui/browsing/artistpage.go
+3 -3
View File
@@ -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))
}
}
ui/browsing/browsingpane.go
+2 -2
View File
@@ -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
}
ui/browsing/favoritespage.go
+3 -3
View File
@@ -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))
}
}
ui/browsing/nowplayingpage.go
+13 -11
View File
@@ -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
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) {
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() {
ui/browsing/trackspage.go
+2 -2
View File
@@ -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)