Refactor: move some playback-related functions to backend package

backend/mediaprovider/helpers/other.go

@@ -1,6 +1,8 @@
 package helpers
 
 import (
+	"fmt"
+
 	"github.com/dweymouth/supersonic/backend/mediaprovider"
 	"github.com/dweymouth/supersonic/sharedutil"
 )
@@ -8,7 +10,6 @@ import (
 func GetSimilarSongsFallback(mp mediaprovider.MediaProvider, track *mediaprovider.Track, count int) []*mediaprovider.Track {
 	var tracks []*mediaprovider.Track
 	if len(track.ArtistIDs) > 0 {
-		tracks, _ = mp.GetSimilarTracks(track.ArtistIDs[0], count)
 	}
 	if len(tracks) == 0 {
 		tracks, _ = mp.GetRandomTracks(track.Genre, count)
@@ -19,3 +20,19 @@ func GetSimilarSongsFallback(mp mediaprovider.MediaProvider, track *mediaprovide
 		return t.ID != track.ID
 	})
 }
+
+func GetArtistTracks(mp mediaprovider.MediaProvider, artistID string) ([]*mediaprovider.Track, error) {
+	artist, err := mp.GetArtist(artistID)
+	if err != nil {
+		return nil, fmt.Errorf("error getting artist tracks: %v", err.Error())
+	}
+	var allTracks []*mediaprovider.Track
+	for _, album := range artist.Albums {
+		album, err := mp.GetAlbum(album.ID)
+		if err != nil {
+			return nil, fmt.Errorf("error loading album tracks: %v", err.Error())
+		}
+		allTracks = append(allTracks, album.Tracks...)
+	}
+	return allTracks, nil
+}

backend/mediaprovider/jellyfin/jellyfinmediaprovider.go

@@ -145,6 +145,10 @@ func (j *jellyfinMediaProvider) GetArtist(artistID string) (*mediaprovider.Artis
 	return artist, nil
 }
 
+func (j *jellyfinMediaProvider) GetArtistTracks(artistID string) ([]*mediaprovider.Track, error) {
+	return helpers.GetArtistTracks(j, artistID)
+}
+
 func (j *jellyfinMediaProvider) GetArtistInfo(artistID string) (*mediaprovider.ArtistInfo, error) {
 	ar, err := j.client.GetArtist(artistID)
 	if err != nil {

backend/mediaprovider/mediaprovider.go

@@ -181,6 +181,8 @@ type MediaProvider interface {
 
 	GetArtist(artistID string) (*ArtistWithAlbums, error)
 
+	GetArtistTracks(artistID string) ([]*Track, error)
+
 	GetArtistInfo(artistID string) (*ArtistInfo, error)
 
 	GetPlaylist(playlistID string) (*PlaylistWithTracks, error)

backend/mediaprovider/subsonic/subsonicmediaprovider.go

@@ -121,6 +121,10 @@ func (s *subsonicMediaProvider) GetArtist(artistID string) (*mediaprovider.Artis
 	}, nil
 }
 
+func (s *subsonicMediaProvider) GetArtistTracks(artistID string) ([]*mediaprovider.Track, error) {
+	return helpers.GetArtistTracks(s, artistID)
+}
+
 func (s *subsonicMediaProvider) GetArtistInfo(artistID string) (*mediaprovider.ArtistInfo, error) {
 	info, err := s.client.GetArtistInfo2(artistID, map[string]string{})
 	if err != nil {