third-party-mirrors/navidrome
1
0
Fork 0
mirror of https://github.com/navidrome/navidrome.git synced 2025-04-15 03:30:39 +03:00
Code Issues Packages Projects Releases Wiki Activity

Optimize refresh events for scrobble endpoint

Browse Source
This commit is contained in:
Deluan 2021-06-16 10:23:34 -04:00
parent fb7229a53e
commit 86271f0412
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/events/events.go
View File

@ -53,6 +53,9 @@ func (rr *RefreshResource) With(resource string, ids ...string) *RefreshResource
if rr.resources == nil {
rr.resources = make(map[string][]string)
}
if len(ids) == 0 {
rr.resources[resource] = append(rr.resources[resource], Any)
}
for i := range ids {
rr.resources[resource] = append(rr.resources[resource], ids[i])
}

4
server/events/events_test.go
View File

@ -37,8 +37,8 @@ var _ = Describe("Events", func() {
data := rr.Data(rr)
Expect(data).To(Equal(`{"album":["al-1","al-2","al-3"],"artist":["ar-1","ar-2"],"song":["sg-1","sg-2"]}`))
})
It("should send a * for when Any is used as id", func() {
rr.With("album", Any)
It("should send a * when no ids are specified", func() {
rr.With("album")
data := rr.Data(rr)
Expect(data).To(Equal(`{"album":["*"]}`))
})

13
server/subsonic/media_annotation.go
View File

@ -127,6 +127,9 @@ func (c *MediaAnnotationController) Scrobble(w http.ResponseWriter, r *http.Requ
playerId := 1 // TODO Multiple players, based on playerName/username/clientIP(?)
playerName := utils.ParamString(r, "c")
username := utils.ParamString(r, "u")
ctx := r.Context()
event := &events.RefreshResource{}
submissions := 0
log.Debug(r, "Scrobbling tracks", "ids", ids, "times", times, "submission", submission)
for i, id := range ids {
@ -137,19 +140,24 @@ func (c *MediaAnnotationController) Scrobble(w http.ResponseWriter, r *http.Requ
t = time.Now()
}
if submission {
_, err := c.scrobblerRegister(r.Context(), playerId, id, t)
mf, err := c.scrobblerRegister(ctx, playerId, id, t)
if err != nil {
log.Error(r, "Error scrobbling track", "id", id, err)
continue
}
submissions++
event.With("song", mf.ID).With("album", mf.AlbumID).With("artist", mf.AlbumArtistID)
} else {
_, err := c.scrobblerNowPlaying(r.Context(), playerId, playerName, id, username)
_, err := c.scrobblerNowPlaying(ctx, playerId, playerName, id, username)
if err != nil {
log.Error(r, "Error setting current song", "id", id, err)
continue
}
}
}
if submissions > 0 {
c.broker.SendMessage(ctx, event)
}
return newResponse(), nil
}
@ -177,7 +185,6 @@ func (c *MediaAnnotationController) scrobblerRegister(ctx context.Context, playe
if err != nil {
log.Error("Error while scrobbling", "trackId", trackId, "user", username, err)
} else {
c.broker.SendMessage(ctx, &events.RefreshResource{})
log.Info("Scrobbled", "title", mf.Title, "artist", mf.Artist, "user", username)
}