use error toasts for errors playing random/similar tracks

This commit is contained in:
Drew Weymouth
2025-01-07 07:15:23 -08:00
parent 177aea89d2
commit ecc691fe52
5 changed files with 36 additions and 9 deletions
+7 -6
View File
@@ -277,14 +277,14 @@ func (p *PlaybackManager) PlayTrackAt(idx int) {
p.cmdQueue.PlayTrackAt(idx) p.cmdQueue.PlayTrackAt(idx)
} }
func (p *PlaybackManager) PlayRandomSongs(genreName string) { func (p *PlaybackManager) PlayRandomSongs(genreName string) error {
p.fetchAndPlayTracks(func() ([]*mediaprovider.Track, error) { return p.fetchAndPlayTracks(func() ([]*mediaprovider.Track, error) {
return p.engine.sm.Server.GetRandomTracks(genreName, p.cfg.EnqueueBatchSize) return p.engine.sm.Server.GetRandomTracks(genreName, p.cfg.EnqueueBatchSize)
}) })
} }
func (p *PlaybackManager) PlaySimilarSongs(id string) { func (p *PlaybackManager) PlaySimilarSongs(id string) error {
p.fetchAndPlayTracks(func() ([]*mediaprovider.Track, error) { return p.fetchAndPlayTracks(func() ([]*mediaprovider.Track, error) {
return p.engine.sm.Server.GetSimilarTracks(id, p.cfg.EnqueueBatchSize) return p.engine.sm.Server.GetSimilarTracks(id, p.cfg.EnqueueBatchSize)
}) })
} }
@@ -298,15 +298,16 @@ func (p *PlaybackManager) PlayRadioStation(station *mediaprovider.RadioStation)
p.PlayFromBeginning() p.PlayFromBeginning()
} }
func (p *PlaybackManager) fetchAndPlayTracks(fetchFn func() ([]*mediaprovider.Track, error)) { func (p *PlaybackManager) fetchAndPlayTracks(fetchFn func() ([]*mediaprovider.Track, error)) error {
if songs, err := fetchFn(); err != nil { if songs, err := fetchFn(); err != nil {
log.Printf("error fetching tracks: %s", err.Error()) return err
} else { } else {
p.LoadTracks(songs, Replace, false) p.LoadTracks(songs, Replace, false)
if p.engine.replayGainCfg.Mode == ReplayGainAuto { if p.engine.replayGainCfg.Mode == ReplayGainAuto {
p.SetReplayGainMode(player.ReplayGainTrack) p.SetReplayGainMode(player.ReplayGainTrack)
} }
p.PlayFromBeginning() p.PlayFromBeginning()
return nil
} }
} }
+2
View File
@@ -210,6 +210,8 @@
"Track peak": "Track peak", "Track peak": "Track peak",
"tracks": "tracks", "tracks": "tracks",
"UI Scaling": "UI Scaling", "UI Scaling": "UI Scaling",
"Unable to play artist radio": "Unable to play artist radio",
"Unable to play random tracks": "Unable to play random tracks",
"URL": "URL", "URL": "URL",
"Use legacy authentication": "Use legacy authentication", "Use legacy authentication": "Use legacy authentication",
"Username": "Username", "Username": "Username",
+7 -1
View File
@@ -171,7 +171,13 @@ func (g *ArtistPage) Scroll(scrollAmt float32) {
} }
func (a *ArtistPage) playArtistRadio() { func (a *ArtistPage) playArtistRadio() {
go a.pm.PlaySimilarSongs(a.artistID) go func() {
err := a.pm.PlaySimilarSongs(a.artistID)
if err != nil {
log.Println("error playing similar songs: %v", err)
a.contr.ToastProvider.ShowErrorToast(lang.L("Unable to play artist radio"))
}
}()
} }
func (a *ArtistPage) showAlbumSortMenu() { func (a *ArtistPage) showAlbumSortMenu() {
+11 -1
View File
@@ -1,6 +1,8 @@
package browsing package browsing
import ( import (
"log"
"github.com/dweymouth/supersonic/backend" "github.com/dweymouth/supersonic/backend"
"github.com/dweymouth/supersonic/backend/mediaprovider" "github.com/dweymouth/supersonic/backend/mediaprovider"
"github.com/dweymouth/supersonic/ui/controller" "github.com/dweymouth/supersonic/ui/controller"
@@ -58,7 +60,15 @@ func (g *genrePageAdapter) Route() controller.Route {
} }
func (g *genrePageAdapter) ActionButton() *widget.Button { func (g *genrePageAdapter) ActionButton() *widget.Button {
fn := func() { go g.pm.PlayRandomSongs(g.genre) } fn := func() {
go func() {
err := g.pm.PlayRandomSongs(g.genre)
if err != nil {
log.Println("error playing random tracks: %v", err)
g.contr.ToastProvider.ShowErrorToast(lang.L("Unable to play random tracks"))
}
}()
}
return widget.NewButtonWithIcon(lang.L("Play random"), myTheme.ShuffleIcon, fn) return widget.NewButtonWithIcon(lang.L("Play random"), myTheme.ShuffleIcon, fn)
} }
+9 -1
View File
@@ -1,6 +1,8 @@
package browsing package browsing
import ( import (
"log"
"github.com/dweymouth/supersonic/backend" "github.com/dweymouth/supersonic/backend"
"github.com/dweymouth/supersonic/backend/mediaprovider" "github.com/dweymouth/supersonic/backend/mediaprovider"
"github.com/dweymouth/supersonic/sharedutil" "github.com/dweymouth/supersonic/sharedutil"
@@ -205,7 +207,13 @@ func (s *tracksPageState) Restore() Page {
} }
func (t *TracksPage) playRandomSongs() { func (t *TracksPage) playRandomSongs() {
t.contr.App.PlaybackManager.PlayRandomSongs("") go func() {
err := t.contr.App.PlaybackManager.PlayRandomSongs("")
if err != nil {
log.Println("error playing random tracks: %v", err)
t.contr.ToastProvider.ShowErrorToast(lang.L("Unable to play random tracks"))
}
}()
} }
func (t *TracksPage) obtainTracklist() *widgets.Tracklist { func (t *TracksPage) obtainTracklist() *widgets.Tracklist {