Add Stars to the DB, including Artists! Only if DevUseFolderScanner is true

engine/common.go

@@ -50,6 +50,7 @@ func FromArtist(ar *model.Artist) Entry {
 	e.Id = ar.ID
 	e.Title = ar.Name
 	e.AlbumCount = ar.AlbumCount
+	e.Starred = ar.StarredAt
 	e.IsDir = true
 	return e
 }
@@ -137,3 +138,11 @@ func FromMediaFiles(mfs model.MediaFiles) Entries {
 	}
 	return entries
 }
+
+func FromArtists(ars model.Artists) Entries {
+	entries := make(Entries, len(ars))
+	for i, ar := range ars {
+		entries[i] = FromArtist(&ar)
+	}
+	return entries
+}

engine/list_generator.go

@@ -17,16 +17,17 @@ type ListGenerator interface {
 	GetByName(offset int, size int) (Entries, error)
 	GetByArtist(offset int, size int) (Entries, error)
 	GetStarred(offset int, size int) (Entries, error)
-	GetAllStarred() (albums Entries, mediaFiles Entries, err error)
+	GetAllStarred() (artists Entries, albums Entries, mediaFiles Entries, err error)
 	GetNowPlaying() (Entries, error)
 	GetRandomSongs(size int) (Entries, error)
 }
 
-func NewListGenerator(alr model.AlbumRepository, mfr model.MediaFileRepository, npr model.NowPlayingRepository) ListGenerator {
-	return &listGenerator{alr, mfr, npr}
+func NewListGenerator(arr model.ArtistRepository, alr model.AlbumRepository, mfr model.MediaFileRepository, npr model.NowPlayingRepository) ListGenerator {
+	return &listGenerator{arr, alr, mfr, npr}
 }
 
 type listGenerator struct {
+	artistRepo   model.ArtistRepository
 	albumRepo    model.AlbumRepository
 	mfRepository model.MediaFileRepository
 	npRepo       model.NowPlayingRepository
@@ -111,7 +112,7 @@ func (g *listGenerator) GetRandomSongs(size int) (Entries, error) {
 }
 
 func (g *listGenerator) GetStarred(offset int, size int) (Entries, error) {
-	qo := model.QueryOptions{Offset: offset, Size: size, Desc: true}
+	qo := model.QueryOptions{Offset: offset, Size: size, SortBy: "starred_at", Desc: true}
 	albums, err := g.albumRepo.GetStarred(qo)
 	if err != nil {
 		return nil, err
@@ -120,15 +121,24 @@ func (g *listGenerator) GetStarred(offset int, size int) (Entries, error) {
 	return FromAlbums(albums), nil
 }
 
-func (g *listGenerator) GetAllStarred() (Entries, Entries, error) {
-	albums, err := g.GetStarred(0, -1)
+// TODO Return is confusing
+func (g *listGenerator) GetAllStarred() (Entries, Entries, Entries, error) {
+	artists, err := g.artistRepo.GetStarred(model.QueryOptions{SortBy: "starred_at", Desc: true})
 	if err != nil {
-		return nil, nil, err
+		return nil, nil, nil, err
 	}
 
-	mediaFiles, err := g.mfRepository.GetStarred(model.QueryOptions{Desc: true})
+	albums, err := g.GetStarred(0, -1)
+	if err != nil {
+		return nil, nil, nil, err
+	}
 
-	return albums, FromMediaFiles(mediaFiles), err
+	mediaFiles, err := g.mfRepository.GetStarred(model.QueryOptions{SortBy: "starred_at", Desc: true})
+	if err != nil {
+		return nil, nil, nil, err
+	}
+
+	return FromArtists(artists), albums, FromMediaFiles(mediaFiles), err
 }
 
 func (g *listGenerator) GetNowPlaying() (Entries, error) {

engine/ratings.go

@@ -3,6 +3,7 @@ package engine
 import (
 	"context"
 
+	"github.com/cloudsonic/sonic-server/conf"
 	"github.com/cloudsonic/sonic-server/itunesbridge"
 	"github.com/cloudsonic/sonic-server/log"
 	"github.com/cloudsonic/sonic-server/model"
@@ -55,6 +56,19 @@ func (r ratings) SetRating(ctx context.Context, id string, rating int) error {
 }
 
 func (r ratings) SetStar(ctx context.Context, star bool, ids ...string) error {
+	if conf.Sonic.DevUseFileScanner {
+		err := r.mfRepo.SetStar(star, ids...)
+		if err != nil {
+			return err
+		}
+		err = r.albumRepo.SetStar(star, ids...)
+		if err != nil {
+			return err
+		}
+		err = r.artistRepo.SetStar(star, ids...)
+		return err
+	}
+
 	for _, id := range ids {
 		isAlbum, _ := r.albumRepo.Exists(id)
 		if isAlbum {