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

New implementation of NowPlaying

Browse Source
This commit is contained in:
Deluan
2021-06-19 20:56:56 -04:00
parent 0df0ac0715
commit f8ee6db72a
14 changed files with 233 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/subsonic/album_lists.go
+7 -7
View File
@@ -6,7 +6,7 @@ import (
"net/http"
"time"
"github.com/navidrome/navidrome/core"
"github.com/navidrome/navidrome/core/scrobbler"
"github.com/navidrome/navidrome/log"
"github.com/navidrome/navidrome/model"
"github.com/navidrome/navidrome/server/subsonic/filter"
@@ -15,14 +15,14 @@ import (
)
type AlbumListController struct {
ds model.DataStore
nowPlaying core.NowPlaying
ds model.DataStore
scrobbler scrobbler.Scrobbler
}
func NewAlbumListController(ds model.DataStore, nowPlaying core.NowPlaying) *AlbumListController {
func NewAlbumListController(ds model.DataStore, scrobbler scrobbler.Scrobbler) *AlbumListController {
c := &AlbumListController{
ds: ds,
nowPlaying: nowPlaying,
ds: ds,
scrobbler: scrobbler,
}
return c
}
@@ -134,7 +134,7 @@ func (c *AlbumListController) GetStarred2(w http.ResponseWriter, r *http.Request
func (c *AlbumListController) GetNowPlaying(w http.ResponseWriter, r *http.Request) (*responses.Subsonic, error) {
ctx := r.Context()
npInfo, err := c.nowPlaying.GetAll()
npInfo, err := c.scrobbler.GetNowPlaying(ctx)
if err != nil {
log.Error(r, "Error retrieving now playing list", "error", err)
return nil, err
server/subsonic/api.go
+4 -1
View File
@@ -11,6 +11,7 @@ import (
"github.com/go-chi/chi/v5/middleware"
"github.com/navidrome/navidrome/consts"
"github.com/navidrome/navidrome/core"
"github.com/navidrome/navidrome/core/scrobbler"
"github.com/navidrome/navidrome/log"
"github.com/navidrome/navidrome/model"
"github.com/navidrome/navidrome/scanner"
@@ -33,10 +34,11 @@ type Router struct {
ExternalMetadata core.ExternalMetadata
Scanner scanner.Scanner
Broker events.Broker
Scrobbler scrobbler.Scrobbler
}
func New(ds model.DataStore, artwork core.Artwork, streamer core.MediaStreamer, archiver core.Archiver, players core.Players,
externalMetadata core.ExternalMetadata, scanner scanner.Scanner, broker events.Broker) *Router {
externalMetadata core.ExternalMetadata, scanner scanner.Scanner, broker events.Broker, scrobbler scrobbler.Scrobbler) *Router {
r := &Router{
DataStore: ds,
Artwork: artwork,
@@ -46,6 +48,7 @@ func New(ds model.DataStore, artwork core.Artwork, streamer core.MediaStreamer,
ExternalMetadata: externalMetadata,
Scanner: scanner,
Broker: broker,
Scrobbler: scrobbler,
}
r.Handler = r.routes()
return r
server/subsonic/media_annotation.go
+12 -11
View File
@@ -7,6 +7,7 @@ import (
"time"
"github.com/navidrome/navidrome/core"
"github.com/navidrome/navidrome/core/scrobbler"
"github.com/navidrome/navidrome/log"
"github.com/navidrome/navidrome/model"
"github.com/navidrome/navidrome/model/request"
@@ -16,13 +17,13 @@ import (
)
type MediaAnnotationController struct {
ds model.DataStore
npRepo core.NowPlaying
broker events.Broker
ds model.DataStore
scrobbler scrobbler.Scrobbler
broker events.Broker
}
func NewMediaAnnotationController(ds model.DataStore, npr core.NowPlaying, broker events.Broker) *MediaAnnotationController {
return &MediaAnnotationController{ds: ds, npRepo: npr, broker: broker}
func NewMediaAnnotationController(ds model.DataStore, scrobbler scrobbler.Scrobbler, broker events.Broker) *MediaAnnotationController {
return &MediaAnnotationController{ds: ds, scrobbler: scrobbler, broker: broker}
}
func (c *MediaAnnotationController) SetRating(w http.ResponseWriter, r *http.Request) (*responses.Subsonic, error) {
@@ -148,7 +149,7 @@ func (c *MediaAnnotationController) Scrobble(w http.ResponseWriter, r *http.Requ
submissions++
event.With("song", mf.ID).With("album", mf.AlbumID).With("artist", mf.AlbumArtistID)
} else {
_, err := c.scrobblerNowPlaying(ctx, 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
@@ -191,20 +192,20 @@ func (c *MediaAnnotationController) scrobblerRegister(ctx context.Context, playe
return mf, err
}
func (c *MediaAnnotationController) scrobblerNowPlaying(ctx context.Context, playerId int, playerName, trackId, username string) (*model.MediaFile, error) {
func (c *MediaAnnotationController) scrobblerNowPlaying(ctx context.Context, playerId int, playerName, trackId, username string) error {
mf, err := c.ds.MediaFile(ctx).Get(trackId)
if err != nil {
return nil, err
return err
}
if mf == nil {
return nil, fmt.Errorf(`ID "%s" not found`, trackId)
return fmt.Errorf(`ID "%s" not found`, trackId)
}
log.Info("Now Playing", "title", mf.Title, "artist", mf.Artist, "user", username)
info := &core.NowPlayingInfo{TrackID: trackId, Username: username, Start: time.Now(), PlayerId: playerId, PlayerName: playerName}
return mf, c.npRepo.Enqueue(info)
err = c.scrobbler.NowPlaying(ctx, playerId, playerName, trackId)
return err
}
func (c *MediaAnnotationController) setStar(ctx context.Context, star bool, ids ...string) error {
server/subsonic/responses/responses.go
+3 -3
View File
@@ -243,9 +243,9 @@ type Starred struct {
type NowPlayingEntry struct {
Child
UserName string `xml:"username,attr" json:"username,omitempty"`
MinutesAgo int `xml:"minutesAgo,attr" json:"minutesAgo,omitempty"`
PlayerId int `xml:"playerId,attr" json:"playerId,omitempty"`
UserName string `xml:"username,attr" json:"username"`
MinutesAgo int `xml:"minutesAgo,attr" json:"minutesAgo"`
PlayerId int `xml:"playerId,attr" json:"playerId"`
PlayerName string `xml:"playerName,attr" json:"playerName,omitempty"`
}
server/subsonic/wire_gen.go
+15 -6
View File
@@ -7,7 +7,6 @@ package subsonic
import (
"github.com/google/wire"
"github.com/navidrome/navidrome/core"
)
// Injectors from wire_injectors.go:
@@ -26,16 +25,16 @@ func initBrowsingController(router *Router) *BrowsingController {
func initAlbumListController(router *Router) *AlbumListController {
dataStore := router.DataStore
nowPlaying := core.NewNowPlayingRepository()
albumListController := NewAlbumListController(dataStore, nowPlaying)
scrobbler := router.Scrobbler
albumListController := NewAlbumListController(dataStore, scrobbler)
return albumListController
}
func initMediaAnnotationController(router *Router) *MediaAnnotationController {
dataStore := router.DataStore
nowPlaying := core.NewNowPlayingRepository()
scrobbler := router.Scrobbler
broker := router.Broker
mediaAnnotationController := NewMediaAnnotationController(dataStore, nowPlaying, broker)
mediaAnnotationController := NewMediaAnnotationController(dataStore, scrobbler, broker)
return mediaAnnotationController
}
@@ -96,5 +95,15 @@ var allProviders = wire.NewSet(
NewMediaRetrievalController,
NewStreamController,
NewBookmarksController,
NewLibraryScanningController, core.NewNowPlayingRepository, wire.FieldsOf(new(*Router), "DataStore", "Artwork", "Streamer", "Archiver", "ExternalMetadata", "Scanner", "Broker"),
NewLibraryScanningController, wire.FieldsOf(
new(*Router),
"DataStore",
"Artwork",
"Streamer",
"Archiver",
"ExternalMetadata",
"Scanner",
"Broker",
"Scrobbler",
),
)
server/subsonic/wire_injectors.go
+11 -3
View File
@@ -4,7 +4,6 @@ package subsonic
import (
"github.com/google/wire"
"github.com/navidrome/navidrome/core"
)
var allProviders = wire.NewSet(
@@ -19,8 +18,17 @@ var allProviders = wire.NewSet(
NewStreamController,
NewBookmarksController,
NewLibraryScanningController,
core.NewNowPlayingRepository,
wire.FieldsOf(new(*Router), "DataStore", "Artwork", "Streamer", "Archiver", "ExternalMetadata", "Scanner", "Broker"),
wire.FieldsOf(
new(*Router),
"DataStore",
"Artwork",
"Streamer",
"Archiver",
"ExternalMetadata",
"Scanner",
"Broker",
"Scrobbler",
),
)
func initSystemController(router *Router) *SystemController {