arian/navidrome
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Trigger UI refresh on media annotation events: star, setRating and scrobble

Browse Source
This commit is contained in:
Deluan
2021-06-10 12:20:52 -04:00
parent 2afb2db7ef
commit cefc939909
8 changed files with 33 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/subsonic/api.go
+4 -1
View File
@@ -14,6 +14,7 @@ import (
"github.com/navidrome/navidrome/log"
"github.com/navidrome/navidrome/model"
"github.com/navidrome/navidrome/scanner"
"github.com/navidrome/navidrome/server/events"
"github.com/navidrome/navidrome/server/subsonic/responses"
"github.com/navidrome/navidrome/utils"
)
@@ -30,12 +31,13 @@ type Router struct {
Players core.Players
ExternalMetadata core.ExternalMetadata
Scanner scanner.Scanner
Broker events.Broker
mux http.Handler
}
func New(ds model.DataStore, artwork core.Artwork, streamer core.MediaStreamer, archiver core.Archiver, players core.Players,
externalMetadata core.ExternalMetadata, scanner scanner.Scanner) *Router {
externalMetadata core.ExternalMetadata, scanner scanner.Scanner, broker events.Broker) *Router {
r := &Router{
DataStore: ds,
Artwork: artwork,
@@ -44,6 +46,7 @@ func New(ds model.DataStore, artwork core.Artwork, streamer core.MediaStreamer,
Players: players,
ExternalMetadata: externalMetadata,
Scanner: scanner,
Broker: broker,
}
r.mux = r.routes()
return r
server/subsonic/media_annotation.go
+17 -5
View File
@@ -10,6 +10,7 @@ import (
"github.com/navidrome/navidrome/log"
"github.com/navidrome/navidrome/model"
"github.com/navidrome/navidrome/model/request"
"github.com/navidrome/navidrome/server/events"
"github.com/navidrome/navidrome/server/subsonic/responses"
"github.com/navidrome/navidrome/utils"
)
@@ -17,10 +18,11 @@ import (
type MediaAnnotationController struct {
ds model.DataStore
npRepo core.NowPlaying
broker events.Broker
}
func NewMediaAnnotationController(ds model.DataStore, npr core.NowPlaying) *MediaAnnotationController {
return &MediaAnnotationController{ds: ds, npRepo: npr}
func NewMediaAnnotationController(ds model.DataStore, npr core.NowPlaying, broker events.Broker) *MediaAnnotationController {
return &MediaAnnotationController{ds: ds, npRepo: npr, broker: broker}
}
func (c *MediaAnnotationController) SetRating(w http.ResponseWriter, r *http.Request) (*responses.Subsonic, error) {
@@ -55,16 +57,22 @@ func (c *MediaAnnotationController) setRating(ctx context.Context, id string, ra
if exist, err = c.ds.Artist(ctx).Exists(id); err != nil {
return err
} else if exist {
return c.ds.Artist(ctx).SetRating(rating, id)
err = c.ds.Artist(ctx).SetRating(rating, id)
c.broker.SendMessage(&events.RefreshResource{Resource: "artist"})
return err
}
if exist, err = c.ds.Album(ctx).Exists(id); err != nil {
return err
} else if exist {
return c.ds.Album(ctx).SetRating(rating, id)
err = c.ds.Album(ctx).SetRating(rating, id)
c.broker.SendMessage(&events.RefreshResource{Resource: "album"})
return err
}
return c.ds.MediaFile(ctx).SetRating(rating, id)
err = c.ds.MediaFile(ctx).SetRating(rating, id)
c.broker.SendMessage(&events.RefreshResource{Resource: "song"})
return err
}
func (c *MediaAnnotationController) Star(w http.ResponseWriter, r *http.Request) (*responses.Subsonic, error) {
@@ -166,6 +174,7 @@ 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(&events.RefreshResource{})
log.Info("Scrobbled", "title", mf.Title, "artist", mf.Artist, "user", username)
}
@@ -209,6 +218,7 @@ func (c *MediaAnnotationController) setStar(ctx context.Context, star bool, ids
if err != nil {
return err
}
c.broker.SendMessage(&events.RefreshResource{Resource: "album"})
continue
}
exist, err = tx.Artist(ctx).Exists(id)
@@ -220,12 +230,14 @@ func (c *MediaAnnotationController) setStar(ctx context.Context, star bool, ids
if err != nil {
return err
}
c.broker.SendMessage(&events.RefreshResource{Resource: "artist"})
continue
}
err = tx.MediaFile(ctx).SetStar(star, ids...)
if err != nil {
return err
}
c.broker.SendMessage(&events.RefreshResource{})
}
return nil
})
server/subsonic/wire_gen.go
+3 -2
View File
@@ -34,7 +34,8 @@ func initAlbumListController(router *Router) *AlbumListController {
func initMediaAnnotationController(router *Router) *MediaAnnotationController {
dataStore := router.DataStore
nowPlaying := core.NewNowPlayingRepository()
mediaAnnotationController := NewMediaAnnotationController(dataStore, nowPlaying)
broker := router.Broker
mediaAnnotationController := NewMediaAnnotationController(dataStore, nowPlaying, broker)
return mediaAnnotationController
}
@@ -95,5 +96,5 @@ var allProviders = wire.NewSet(
NewMediaRetrievalController,
NewStreamController,
NewBookmarksController,
NewLibraryScanningController, core.NewNowPlayingRepository, wire.FieldsOf(new(*Router), "DataStore", "Artwork", "Streamer", "Archiver", "ExternalMetadata", "Scanner"),
NewLibraryScanningController, core.NewNowPlayingRepository, wire.FieldsOf(new(*Router), "DataStore", "Artwork", "Streamer", "Archiver", "ExternalMetadata", "Scanner", "Broker"),
)
server/subsonic/wire_injectors.go
+1 -1
View File
@@ -20,7 +20,7 @@ var allProviders = wire.NewSet(
NewBookmarksController,
NewLibraryScanningController,
core.NewNowPlayingRepository,
wire.FieldsOf(new(*Router), "DataStore", "Artwork", "Streamer", "Archiver", "ExternalMetadata", "Scanner"),
wire.FieldsOf(new(*Router), "DataStore", "Artwork", "Streamer", "Archiver", "ExternalMetadata", "Scanner", "Broker"),
)
func initSystemController(router *Router) *SystemController {