Replaced Beego logging
This commit is contained in:
+11
-9
@@ -1,15 +1,17 @@
|
||||
package engine
|
||||
|
||||
import (
|
||||
"github.com/astaxie/beego"
|
||||
"context"
|
||||
|
||||
"github.com/cloudsonic/sonic-server/domain"
|
||||
"github.com/cloudsonic/sonic-server/itunesbridge"
|
||||
"github.com/cloudsonic/sonic-server/log"
|
||||
"github.com/cloudsonic/sonic-server/utils"
|
||||
)
|
||||
|
||||
type Ratings interface {
|
||||
SetStar(star bool, ids ...string) error
|
||||
SetRating(id string, rating int) error
|
||||
SetStar(ctx context.Context, star bool, ids ...string) error
|
||||
SetRating(ctx context.Context, id string, rating int) error
|
||||
}
|
||||
|
||||
func NewRatings(itunes itunesbridge.ItunesControl, mr domain.MediaFileRepository, alr domain.AlbumRepository, ar domain.ArtistRepository) Ratings {
|
||||
@@ -23,14 +25,14 @@ type ratings struct {
|
||||
artistRepo domain.ArtistRepository
|
||||
}
|
||||
|
||||
func (r ratings) SetRating(id string, rating int) error {
|
||||
func (r ratings) SetRating(ctx context.Context, id string, rating int) error {
|
||||
rating = utils.MinInt(rating, 5) * 20
|
||||
|
||||
isAlbum, _ := r.albumRepo.Exists(id)
|
||||
if isAlbum {
|
||||
mfs, _ := r.mfRepo.FindByAlbum(id)
|
||||
if len(mfs) > 0 {
|
||||
beego.Debug("SetRating:", rating, "Album:", mfs[0].Album)
|
||||
log.Debug(ctx, "Set Rating", "value", rating, "album", mfs[0].Album)
|
||||
if err := r.itunes.SetAlbumRating(mfs[0].Id, rating); err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -43,7 +45,7 @@ func (r ratings) SetRating(id string, rating int) error {
|
||||
return err
|
||||
}
|
||||
if mf != nil {
|
||||
beego.Debug("SetRating:", rating, "Song:", mf.Title)
|
||||
log.Debug(ctx, "Set Rating", "value", rating, "song", mf.Title)
|
||||
if err := r.itunes.SetTrackRating(mf.Id, rating); err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -52,13 +54,13 @@ func (r ratings) SetRating(id string, rating int) error {
|
||||
return domain.ErrNotFound
|
||||
}
|
||||
|
||||
func (r ratings) SetStar(star bool, ids ...string) error {
|
||||
func (r ratings) SetStar(ctx context.Context, star bool, ids ...string) error {
|
||||
for _, id := range ids {
|
||||
isAlbum, _ := r.albumRepo.Exists(id)
|
||||
if isAlbum {
|
||||
mfs, _ := r.mfRepo.FindByAlbum(id)
|
||||
if len(mfs) > 0 {
|
||||
beego.Debug("SetStar:", star, "Album:", mfs[0].Album)
|
||||
log.Debug(ctx, "Set Star", "value", star, "album", mfs[0].Album)
|
||||
if err := r.itunes.SetAlbumLoved(mfs[0].Id, star); err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -71,7 +73,7 @@ func (r ratings) SetStar(star bool, ids ...string) error {
|
||||
return err
|
||||
}
|
||||
if mf != nil {
|
||||
beego.Debug("SetStar:", star, "Song:", mf.Title)
|
||||
log.Debug(ctx, "Set Star", "value", star, "song", mf.Title)
|
||||
if err := r.itunes.SetTrackLoved(mf.Id, star); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user