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

Revert "refactor play count update to be cleaner, code-wise"

Browse Source 
This reverts commit cd52a893d4, which introduced a regression.
Pages with a tracklist may not have the same in-memory model of the track,
so it is necessary to directly inform them of play count updates.
This commit is contained in:
Drew Weymouth
2023-02-21 17:43:06 -08:00
parent cd52a893d4
commit d9ec269191
8 changed files with 36 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui/browsing/albumpage.go
+2 -3
View File
@@ -100,15 +100,14 @@ func (a *AlbumPage) Route() Route {
return AlbumRoute(a.albumID)
}
var _ CanShowNowPlaying = (*AlbumPage)(nil)
func (a *AlbumPage) OnSongChange(song *subsonic.Child) {
func (a *AlbumPage) OnSongChange(song *subsonic.Child, lastScrobbledIfAny *subsonic.Child) {
if song == nil {
a.nowPlayingID = ""
} else {
a.nowPlayingID = song.ID
}
a.tracklist.SetNowPlaying(a.nowPlayingID)
a.tracklist.IncrementPlayCount(lastScrobbledIfAny)
}
func (a *AlbumPage) Reload() {
ui/browsing/browsingpane.go
+4 -4
View File
@@ -36,7 +36,7 @@ type CanSelectAll interface {
}
type CanShowNowPlaying interface {
OnSongChange(song *subsonic.Child)
OnSongChange(song *subsonic.Child, lastScrobbledIfAny *subsonic.Child)
}
type BrowsingPane struct {
@@ -150,7 +150,7 @@ func (b *BrowsingPane) doSetPage(p Page) bool {
b.curPage = p
if np, ok := p.(CanShowNowPlaying); ok {
// inform page of currently playing track
np.OnSongChange(b.app.PlaybackManager.NowPlaying())
np.OnSongChange(b.app.PlaybackManager.NowPlaying(), nil)
}
b.pageContainer.Remove(b.curPage)
b.pageContainer.Objects[1] = p
@@ -158,12 +158,12 @@ func (b *BrowsingPane) doSetPage(p Page) bool {
return true
}
func (b *BrowsingPane) onSongChange(song *subsonic.Child) {
func (b *BrowsingPane) onSongChange(song *subsonic.Child, lastScrobbledIfAny *subsonic.Child) {
if b.curPage == nil {
return
}
if p, ok := b.curPage.(CanShowNowPlaying); ok {
p.OnSongChange(song)
p.OnSongChange(song, lastScrobbledIfAny)
}
}
ui/browsing/nowplayingpage.go
+2 -3
View File
@@ -79,15 +79,14 @@ func (a *NowPlayingPage) SelectAll() {
a.tracklist.SelectAll()
}
var _ CanShowNowPlaying = (*NowPlayingPage)(nil)
func (a *NowPlayingPage) OnSongChange(song *subsonic.Child) {
func (a *NowPlayingPage) OnSongChange(song *subsonic.Child, lastScrobbledIfAny *subsonic.Child) {
if song == nil {
a.nowPlayingID = ""
} else {
a.nowPlayingID = song.ID
}
a.tracklist.SetNowPlaying(a.nowPlayingID)
a.tracklist.IncrementPlayCount(lastScrobbledIfAny)
}
func (a *NowPlayingPage) Reload() {
ui/browsing/playlistpage.go
+2 -3
View File
@@ -86,15 +86,14 @@ func (a *PlaylistPage) Route() Route {
return PlaylistRoute(a.playlistID)
}
var _ CanShowNowPlaying = (*PlaylistPage)(nil)
func (a *PlaylistPage) OnSongChange(song *subsonic.Child) {
func (a *PlaylistPage) OnSongChange(song *subsonic.Child, lastScrobbledIfAny *subsonic.Child) {
if song == nil {
a.nowPlayingID = ""
} else {
a.nowPlayingID = song.ID
}
a.tracklist.SetNowPlaying(a.nowPlayingID)
a.tracklist.IncrementPlayCount(lastScrobbledIfAny)
}
func (a *PlaylistPage) Reload() {