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

use pre-existing page from widget pool in constructor if possible

Browse Source
This commit is contained in:
Drew Weymouth
2024-05-26 12:28:33 -07:00
parent a3292bf9ee
commit edb6654bee
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui/browsing/nowplayingpage.go
+16 -7
View File
@@ -86,6 +86,10 @@ func NewNowPlayingPage(
canShare bool, canShare bool,
lrcLibEnabled bool, lrcLibEnabled bool,
) *NowPlayingPage { ) *NowPlayingPage {
if page, ok := pool.Obtain(util.WidgetTypeNowPlayingPage).(*NowPlayingPage); ok && page != nil {
page.Reload()
return page
}
a := &NowPlayingPage{nowPlayingPageState: nowPlayingPageState{ a := &NowPlayingPage{nowPlayingPageState: nowPlayingPageState{
conf: conf, contr: contr, pool: pool, sm: sm, im: im, pm: pm, mp: mp, canRate: canRate, canShare: canShare, lrcLib: lrcLibEnabled, conf: conf, contr: contr, pool: pool, sm: sm, im: im, pm: pm, mp: mp, canRate: canRate, canShare: canShare, lrcLib: lrcLibEnabled,
}} }}
@@ -96,7 +100,6 @@ func NewNowPlayingPage(
pm.OnStopped(a.formatStatusLine) pm.OnStopped(a.formatStatusLine)
a.card = widgets.NewLargeNowPlayingCard() a.card = widgets.NewLargeNowPlayingCard()
a.card.DisableRating = !canRate
a.card.OnAlbumNameTapped = func() { a.card.OnAlbumNameTapped = func() {
contr.NavigateTo(controller.AlbumRoute(sharedutil.AlbumIDOrEmptyStr(a.nowPlaying))) contr.NavigateTo(controller.AlbumRoute(sharedutil.AlbumIDOrEmptyStr(a.nowPlaying)))
} }
@@ -112,8 +115,6 @@ func NewNowPlayingPage(
a.queueList = widgets.NewPlayQueueList(a.im) a.queueList = widgets.NewPlayQueueList(a.im)
a.relatedList = widgets.NewPlayQueueList(a.im) a.relatedList = widgets.NewPlayQueueList(a.im)
a.queueList.DisableRating = !canRate
a.queueList.DisableSharing = !canShare
a.queueList.OnReorderTracks = a.doSetNewTrackOrder a.queueList.OnReorderTracks = a.doSetNewTrackOrder
a.queueList.OnDownload = contr.ShowDownloadDialog a.queueList.OnDownload = contr.ShowDownloadDialog
a.queueList.OnShare = func(tracks []*mediaprovider.Track) { a.queueList.OnShare = func(tracks []*mediaprovider.Track) {
@@ -222,6 +223,12 @@ func (a *NowPlayingPage) Save() SavedPage {
a.imageLoadCancel() a.imageLoadCancel()
} }
nps := a.nowPlayingPageState nps := a.nowPlayingPageState
a.nowPlayingID = ""
a.nowPlaying = nil
a.curLyricsID = ""
a.curRelatedID = ""
a.queue = nil
a.related = nil
a.pool.Release(util.WidgetTypeNowPlayingPage, a) a.pool.Release(util.WidgetTypeNowPlayingPage, a)
return &nps return &nps
} }
@@ -362,6 +369,12 @@ func (a *NowPlayingPage) OnPlayQueueChange() {
} }
func (a *NowPlayingPage) Reload() { func (a *NowPlayingPage) Reload() {
a.card.DisableRating = !a.canRate
a.queueList.DisableRating = !a.canRate
a.queueList.DisableSharing = !a.canShare
a.relatedList.DisableRating = !a.canRate
a.relatedList.DisableSharing = !a.canShare
a.queue = a.pm.GetPlayQueue() a.queue = a.pm.GetPlayQueue()
a.queueList.SetTracks(a.queue) a.queueList.SetTracks(a.queue)
a.totalTime = 0.0 a.totalTime = 0.0
@@ -372,10 +385,6 @@ func (a *NowPlayingPage) Reload() {
} }
func (s *nowPlayingPageState) Restore() Page { func (s *nowPlayingPageState) Restore() Page {
if page := s.pool.Obtain(util.WidgetTypeNowPlayingPage).(*NowPlayingPage); page != nil {
page.Reload()
return page
}
return NewNowPlayingPage(s.conf, s.contr, s.pool, s.sm, s.im, s.pm, s.mp, s.canRate, s.canShare, s.lrcLib) return NewNowPlayingPage(s.conf, s.contr, s.pool, s.sm, s.im, s.pm, s.mp, s.canRate, s.canShare, s.lrcLib)
} }