NowPlaying is not a repo, now it is part of the main engine

persistence/nowplaying_repository.go

@@ -1,75 +0,0 @@
-package persistence
-
-import (
-	"container/list"
-	"sync"
-
-	"github.com/cloudsonic/sonic-server/model"
-)
-
-var playerMap = sync.Map{}
-
-type nowPlayingRepository struct{}
-
-// TODO Make it persistent
-func NewNowPlayingRepository() model.NowPlayingRepository {
-	r := &nowPlayingRepository{}
-	return r
-}
-
-func (r *nowPlayingRepository) getList(id int) *list.List {
-	l, _ := playerMap.LoadOrStore(id, list.New())
-	return l.(*list.List)
-}
-
-func (r *nowPlayingRepository) Enqueue(info *model.NowPlayingInfo) error {
-	l := r.getList(info.PlayerId)
-	l.PushFront(info)
-	return nil
-}
-
-func (r *nowPlayingRepository) Dequeue(playerId int) (*model.NowPlayingInfo, error) {
-	l := r.getList(playerId)
-	e := l.Back()
-	if e == nil {
-		return nil, nil
-	}
-	l.Remove(e)
-	return e.Value.(*model.NowPlayingInfo), nil
-}
-
-func (r *nowPlayingRepository) Head(playerId int) (*model.NowPlayingInfo, error) {
-	l := r.getList(playerId)
-	e := l.Front()
-	if e == nil {
-		return nil, nil
-	}
-	return e.Value.(*model.NowPlayingInfo), nil
-}
-
-func (r *nowPlayingRepository) Tail(playerId int) (*model.NowPlayingInfo, error) {
-	l := r.getList(playerId)
-	e := l.Back()
-	if e == nil {
-		return nil, nil
-	}
-	return e.Value.(*model.NowPlayingInfo), nil
-}
-
-func (r *nowPlayingRepository) Count(playerId int) (int64, error) {
-	l := r.getList(playerId)
-	return int64(l.Len()), nil
-}
-
-func (r *nowPlayingRepository) GetAll() ([]*model.NowPlayingInfo, error) {
-	var all []*model.NowPlayingInfo
-	playerMap.Range(func(playerId, l interface{}) bool {
-		ll := l.(*list.List)
-		e := ll.Front()
-		all = append(all, e.Value.(*model.NowPlayingInfo))
-		return true
-	})
-	return all, nil
-}
-
-var _ model.NowPlayingRepository = (*nowPlayingRepository)(nil)

persistence/nowplaying_repository_test.go

@@ -1,50 +0,0 @@
-package persistence
-
-import (
-	"sync"
-
-	"github.com/cloudsonic/sonic-server/model"
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-)
-
-var _ = Describe("NowPlayingRepository", func() {
-	var repo model.NowPlayingRepository
-
-	BeforeEach(func() {
-		playerMap = sync.Map{}
-		repo = NewNowPlayingRepository()
-	})
-
-	It("enqueues and dequeues records", func() {
-		Expect(repo.Enqueue(&model.NowPlayingInfo{PlayerId: 1, TrackID: "AAA"})).To(BeNil())
-		Expect(repo.Enqueue(&model.NowPlayingInfo{PlayerId: 1, TrackID: "BBB"})).To(BeNil())
-
-		Expect(repo.Tail(1)).To(Equal(&model.NowPlayingInfo{PlayerId: 1, TrackID: "AAA"}))
-		Expect(repo.Head(1)).To(Equal(&model.NowPlayingInfo{PlayerId: 1, TrackID: "BBB"}))
-
-		Expect(repo.Count(1)).To(Equal(int64(2)))
-
-		Expect(repo.Dequeue(1)).To(Equal(&model.NowPlayingInfo{PlayerId: 1, TrackID: "AAA"}))
-		Expect(repo.Count(1)).To(Equal(int64(1)))
-	})
-
-	It("handles multiple players", func() {
-		Expect(repo.Enqueue(&model.NowPlayingInfo{PlayerId: 1, TrackID: "AAA"})).To(BeNil())
-		Expect(repo.Enqueue(&model.NowPlayingInfo{PlayerId: 1, TrackID: "BBB"})).To(BeNil())
-
-		Expect(repo.Enqueue(&model.NowPlayingInfo{PlayerId: 2, TrackID: "CCC"})).To(BeNil())
-		Expect(repo.Enqueue(&model.NowPlayingInfo{PlayerId: 2, TrackID: "DDD"})).To(BeNil())
-
-		Expect(repo.GetAll()).To(ConsistOf([]*model.NowPlayingInfo{
-			{PlayerId: 1, TrackID: "BBB"},
-			{PlayerId: 2, TrackID: "DDD"},
-		}))
-
-		Expect(repo.Count(2)).To(Equal(int64(2)))
-		Expect(repo.Count(2)).To(Equal(int64(2)))
-
-		Expect(repo.Tail(1)).To(Equal(&model.NowPlayingInfo{PlayerId: 1, TrackID: "AAA"}))
-		Expect(repo.Head(2)).To(Equal(&model.NowPlayingInfo{PlayerId: 2, TrackID: "DDD"}))
-	})
-})

persistence/wire_provider.go

@@ -11,7 +11,6 @@ var Set = wire.NewSet(
 	NewCheckSumRepository,
 	NewPropertyRepository,
 	NewPlaylistRepository,
-	NewNowPlayingRepository,
 	NewMediaFolderRepository,
 	NewGenreRepository,
 )