mirrors/navidrome
1
0
Fork 0
mirror of https://github.com/navidrome/navidrome.git synced 2025-04-04 13:07:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

Rename ListenBrainz config flag and enable by default (#1443)

Browse source
This commit is contained in:
Steve Richter 2021-11-17 21:11:53 -05:00 • committed by GitHub
parent da26c5cfe0
commit 3bd6f82c80
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 19 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cmd/root.go
View file

@ -80,7 +80,7 @@ func startServer() (func() error, func(err error)) {
if conf.Server.LastFM.Enabled { if conf.Server.LastFM.Enabled {
a.MountRouter("LastFM Auth", consts.URLPathNativeAPI+"/lastfm", CreateLastFMRouter()) a.MountRouter("LastFM Auth", consts.URLPathNativeAPI+"/lastfm", CreateLastFMRouter())
} }
if conf.Server.DevListenBrainzEnabled { if conf.Server.ListenBrainz.Enabled {
a.MountRouter("ListenBrainz Auth", consts.URLPathNativeAPI+"/listenbrainz", CreateListenBrainzRouter()) a.MountRouter("ListenBrainz Auth", consts.URLPathNativeAPI+"/listenbrainz", CreateListenBrainzRouter())
} }
return a.Run(fmt.Sprintf("%s:%d", conf.Server.Address, conf.Server.Port)) return a.Run(fmt.Sprintf("%s:%d", conf.Server.Address, conf.Server.Port))

16
conf/configuration.go
View file

@ -59,9 +59,10 @@ type configOptions struct {
Scanner scannerOptions Scanner scannerOptions
Agents string Agents string
LastFM lastfmOptions LastFM lastfmOptions
Spotify spotifyOptions Spotify spotifyOptions
ListenBrainz listenBrainzOptions
// DevFlags. These are used to enable/disable debugging and incomplete features // DevFlags. These are used to enable/disable debugging and incomplete features
DevLogSourceLine bool DevLogSourceLine bool
@ -75,7 +76,6 @@ type configOptions struct {
DevSidebarPlaylists bool DevSidebarPlaylists bool
DevEnableBufferedScrobble bool DevEnableBufferedScrobble bool
DevShowArtistPage bool DevShowArtistPage bool
DevListenBrainzEnabled bool
} }
type scannerOptions struct { type scannerOptions struct {
@ -95,6 +95,10 @@ type spotifyOptions struct {
Secret string Secret string
} }
type listenBrainzOptions struct {
Enabled bool
}
var ( var (
Server = &configOptions{} Server = &configOptions{}
hooks []func() hooks []func()
@ -153,10 +157,10 @@ func disableExternalServices() {
log.Info("All external integrations are DISABLED!") log.Info("All external integrations are DISABLED!")
Server.LastFM.Enabled = false Server.LastFM.Enabled = false
Server.Spotify.ID = "" Server.Spotify.ID = ""
Server.ListenBrainz.Enabled = false
if Server.UILoginBackgroundURL == consts.DefaultUILoginBackgroundURL { if Server.UILoginBackgroundURL == consts.DefaultUILoginBackgroundURL {
Server.UILoginBackgroundURL = consts.DefaultUILoginBackgroundURLOffline Server.UILoginBackgroundURL = consts.DefaultUILoginBackgroundURLOffline
} }
Server.DevListenBrainzEnabled = false
} }
func validateScanSchedule() error { func validateScanSchedule() error {
@ -246,6 +250,7 @@ func init() {
viper.SetDefault("lastfm.secret", consts.LastFMAPISecret) viper.SetDefault("lastfm.secret", consts.LastFMAPISecret)
viper.SetDefault("spotify.id", "") viper.SetDefault("spotify.id", "")
viper.SetDefault("spotify.secret", "") viper.SetDefault("spotify.secret", "")
viper.SetDefault("listenbrainz.enabled", true)
// DevFlags. These are used to enable/disable debugging and incomplete features // DevFlags. These are used to enable/disable debugging and incomplete features
viper.SetDefault("devlogsourceline", false) viper.SetDefault("devlogsourceline", false)
@ -258,7 +263,6 @@ func init() {
viper.SetDefault("devenablebufferedscrobble", true) viper.SetDefault("devenablebufferedscrobble", true)
viper.SetDefault("devsidebarplaylists", true) viper.SetDefault("devsidebarplaylists", true)
viper.SetDefault("devshowartistpage", true) viper.SetDefault("devshowartistpage", true)
viper.SetDefault("devlistenbrainzenabled", false)
} }
func InitConfig(cfgFile string) { func InitConfig(cfgFile string) {

2
core/agents/listenbrainz/agent.go
View file

@ -104,7 +104,7 @@ func (l *listenBrainzAgent) IsAuthorized(ctx context.Context, userId string) boo
func init() { func init() {
conf.AddHook(func() { conf.AddHook(func() {
if conf.Server.DevListenBrainzEnabled { if conf.Server.ListenBrainz.Enabled {
scrobbler.Register(listenBrainzAgentName, func(ds model.DataStore) scrobbler.Scrobbler { scrobbler.Register(listenBrainzAgentName, func(ds model.DataStore) scrobbler.Scrobbler {
return listenBrainzConstructor(ds) return listenBrainzConstructor(ds)
}) })

2
server/serve_index.go
View file

@ -49,7 +49,7 @@ func serveIndex(ds model.DataStore, fs fs.FS) http.HandlerFunc {
"lastFMEnabled": conf.Server.LastFM.Enabled, "lastFMEnabled": conf.Server.LastFM.Enabled,
"lastFMApiKey": conf.Server.LastFM.ApiKey, "lastFMApiKey": conf.Server.LastFM.ApiKey,
"devShowArtistPage": conf.Server.DevShowArtistPage, "devShowArtistPage": conf.Server.DevShowArtistPage,
"devListenBrainzEnabled": conf.Server.DevListenBrainzEnabled, "listenBrainzEnabled": conf.Server.ListenBrainz.Enabled,
} }
auth := handleLoginFromHeaders(ds, r) auth := handleLoginFromHeaders(ds, r)
if auth != nil { if auth != nil {

6
server/serve_index_test.go
View file

@ -266,15 +266,15 @@ var _ = Describe("serveIndex", func() {
Expect(config).To(HaveKeyWithValue("devShowArtistPage", true)) Expect(config).To(HaveKeyWithValue("devShowArtistPage", true))
}) })
It("sets the devListenBrainzEnabled", func() { It("sets the listenBrainzEnabled", func() {
conf.Server.DevListenBrainzEnabled = true conf.Server.ListenBrainz.Enabled = true
r := httptest.NewRequest("GET", "/index.html", nil) r := httptest.NewRequest("GET", "/index.html", nil)
w := httptest.NewRecorder() w := httptest.NewRecorder()
serveIndex(ds, fs)(w, r) serveIndex(ds, fs)(w, r)
config := extractAppConfig(w.Body.String()) config := extractAppConfig(w.Body.String())
Expect(config).To(HaveKeyWithValue("devListenBrainzEnabled", true)) Expect(config).To(HaveKeyWithValue("listenBrainzEnabled", true))
}) })
}) })

2
ui/src/config.js
View file

@ -23,9 +23,9 @@ const defaultConfig = {
devSidebarPlaylists: true, devSidebarPlaylists: true,
lastFMEnabled: true, lastFMEnabled: true,
lastFMApiKey: '9b94a5515ea66b2da3ec03c12300327e', lastFMApiKey: '9b94a5515ea66b2da3ec03c12300327e',
listenBrainzEnabled: true,
enableCoverAnimation: true, enableCoverAnimation: true,
devShowArtistPage: true, devShowArtistPage: true,
devListenBrainzEnabled: true,
} }
let config let config

2
ui/src/personal/Personal.js
View file

@ -26,7 +26,7 @@ const Personal = () => {
<SelectDefaultView /> <SelectDefaultView />
<NotificationsToggle /> <NotificationsToggle />
{config.lastFMEnabled && <LastfmScrobbleToggle />} {config.lastFMEnabled && <LastfmScrobbleToggle />}
{config.devListenBrainzEnabled && <ListenBrainzScrobbleToggle />} {config.listenBrainzEnabled && <ListenBrainzScrobbleToggle />}
</SimpleForm> </SimpleForm>
</Card> </Card>
) )

2
ui/src/player/PlayerEdit.js
View file

@ -48,7 +48,7 @@ const PlayerEdit = (props) => (
]} ]}
/> />
<BooleanInput source="reportRealPath" fullWidth /> <BooleanInput source="reportRealPath" fullWidth />
{(config.lastFMEnabled || config.devListenBrainzEnabled) && ( {(config.lastFMEnabled || config.listenBrainzEnabled) && (
<BooleanInput source="scrobbleEnabled" fullWidth /> <BooleanInput source="scrobbleEnabled" fullWidth />
)} )}
<TextField source="client" /> <TextField source="client" />