renun/navidrome
1
0
Fork 0
mirror of https://github.com/navidrome/navidrome.git synced 2025-08-10 00:52:20 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Expiry items in NowPlaying

Browse Source
This commit is contained in:
Deluan
2020-01-20 15:51:33 -05:00
parent 9e5ffaaff4
commit 1e582bec5c
3 changed files with 61 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
engine/scrobbler.go
View File

@@ -9,11 +9,6 @@ import (
"github.com/cloudsonic/sonic-server/model"
)
const (
minSkipped = 3 * time.Second
maxSkipped = 20 * time.Second
)
type Scrobbler interface {
Register(ctx context.Context, playerId int, trackId string, playDate time.Time) (*model.MediaFile, error)
NowPlaying(ctx context.Context, playerId int, playerName, trackId, username string) (*model.MediaFile, error)
@@ -29,19 +24,24 @@ type scrobbler struct {
}
func (s *scrobbler) Register(ctx context.Context, playerId int, trackId string, playTime time.Time) (*model.MediaFile, error) {
// TODO Add transaction
mf, err := s.ds.MediaFile().Get(trackId)
if err != nil {
return nil, err
}
err = s.ds.MediaFile().MarkAsPlayed(trackId, playTime)
if err != nil {
return nil, err
}
err = s.ds.Album().MarkAsPlayed(mf.AlbumID, playTime)
var mf *model.MediaFile
var err error
err = s.ds.WithTx(func(tx model.DataStore) error {
mf, err = s.ds.MediaFile().Get(trackId)
if err != nil {
return err
}
err = s.ds.MediaFile().MarkAsPlayed(trackId, playTime)
if err != nil {
return err
}
err = s.ds.Album().MarkAsPlayed(mf.AlbumID, playTime)
return err
})
return mf, err
}
// TODO Validate if NowPlaying still works after all refactorings
func (s *scrobbler) NowPlaying(ctx context.Context, playerId int, playerName, trackId, username string) (*model.MediaFile, error) {
mf, err := s.ds.MediaFile().Get(trackId)
if err != nil {