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

Introduce a new configuration to select the login background image URL

Browse source
This commit is contained in:
Deluan 2020-04-07 16:58:55 -04:00 • committed by Deluan Quintão
parent a0f389fc3e
commit db246900a6
3 changed files with 18 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
conf/configuration.go
View file

@ -22,6 +22,8 @@ type nd struct {
SessionTimeout string `default:"30m"` SessionTimeout string `default:"30m"`
BaseURL string `default:""` BaseURL string `default:""`
UILoginBackgroundURL string `default:"https://source.unsplash.com/random/1600x900?music"`
IgnoredArticles string `default:"The El La Los Las Le Les Os As O A"` IgnoredArticles string `default:"The El La Los Las Le Les Os As O A"`
IndexGroups string `default:"A B C D E F G H I J K L M N O P Q R S T U V W X-Z(XYZ) [Unknown]([)"` IndexGroups string `default:"A B C D E F G H I J K L M N O P Q R S T U V W X-Z(XYZ) [Unknown]([)"`

5
server/app/serve_index.go
View file

@ -30,8 +30,9 @@ func ServeIndex(ds model.DataStore, fs http.FileSystem) http.HandlerFunc {
} }
t, _ = t.Parse(string(indexStr)) t, _ = t.Parse(string(indexStr))
appConfig := map[string]interface{}{ appConfig := map[string]interface{}{
"firstTime": firstTime, "firstTime": firstTime,
"baseURL": strings.TrimSuffix(conf.Server.BaseURL, "/"), "baseURL": strings.TrimSuffix(conf.Server.BaseURL, "/"),
"loginBackgroundURL": conf.Server.UILoginBackgroundURL,
} }
j, _ := json.Marshal(appConfig) j, _ := json.Marshal(appConfig)
data := map[string]interface{}{ data := map[string]interface{}{

14
server/app/serve_index_test.go
View file

@ -22,6 +22,7 @@ var _ = Describe("ServeIndex", func() {
BeforeEach(func() { BeforeEach(func() {
ds = &persistence.MockDataStore{MockedUser: mockUser} ds = &persistence.MockDataStore{MockedUser: mockUser}
conf.Server.UILoginBackgroundURL = ""
}) })
It("adds app_config to index.html", func() { It("adds app_config to index.html", func() {
@ -57,7 +58,7 @@ var _ = Describe("ServeIndex", func() {
Expect(config).To(HaveKeyWithValue("firstTime", false)) Expect(config).To(HaveKeyWithValue("firstTime", false))
}) })
It("sets baseURL ", func() { It("sets baseURL", func() {
conf.Server.BaseURL = "base_url_test" conf.Server.BaseURL = "base_url_test"
r := httptest.NewRequest("GET", "/index.html", nil) r := httptest.NewRequest("GET", "/index.html", nil)
w := httptest.NewRecorder() w := httptest.NewRecorder()
@ -67,6 +68,17 @@ var _ = Describe("ServeIndex", func() {
config := extractAppConfig(w.Body.String()) config := extractAppConfig(w.Body.String())
Expect(config).To(HaveKeyWithValue("baseURL", "base_url_test")) Expect(config).To(HaveKeyWithValue("baseURL", "base_url_test"))
}) })
It("sets the uiLoginBackgroundURL", func() {
conf.Server.UILoginBackgroundURL = "my_background_url"
r := httptest.NewRequest("GET", "/index.html", nil)
w := httptest.NewRecorder()
ServeIndex(ds, fs)(w, r)
config := extractAppConfig(w.Body.String())
Expect(config).To(HaveKeyWithValue("loginBackgroundURL", "my_background_url"))
})
}) })
var appConfigRegex = regexp.MustCompile(`(?m)window.__APP_CONFIG__="([^"]*)`) var appConfigRegex = regexp.MustCompile(`(?m)window.__APP_CONFIG__="([^"]*)`)