luisgulo/photoprism
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Config: Refactor initSettings() and initHub()

Browse source 
This prevents redundant initialization when called repeatedly.
This commit is contained in:
Michael Mayer 2022-03-28 16:13:41 +02:00
parent 39b0530313
commit 2f5d1fea50
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
internal/config/config.go
View file

@ -600,6 +600,10 @@ func (c *Config) UpdateHub() {
// initHub initializes PhotoPrism hub config. // initHub initializes PhotoPrism hub config.
func (c *Config) initHub() { func (c *Config) initHub() {
if c.hub != nil {
return
}
c.hub = hub.NewConfig(c.Version(), c.HubConfigFile(), c.serial, c.env, c.UserAgent(), c.options.PartnerID) c.hub = hub.NewConfig(c.Version(), c.HubConfigFile(), c.serial, c.env, c.UserAgent(), c.options.PartnerID)
if err := c.hub.Load(); err == nil { if err := c.hub.Load(); err == nil {
@ -626,9 +630,7 @@ func (c *Config) initHub() {
// Hub returns the PhotoPrism hub config. // Hub returns the PhotoPrism hub config.
func (c *Config) Hub() *hub.Config { func (c *Config) Hub() *hub.Config {
if c.hub == nil { c.initHub()
c.initHub()
}
return c.hub return c.hub
} }

8
internal/config/settings.go
View file

@ -218,6 +218,10 @@ func (s *Settings) Save(fileName string) error {
// initSettings initializes user settings from a config file. // initSettings initializes user settings from a config file.
func (c *Config) initSettings() { func (c *Config) initSettings() {
if c.settings != nil {
return
}
c.settings = NewSettings(c) c.settings = NewSettings(c)
fileName := c.SettingsFile() fileName := c.SettingsFile()
@ -236,9 +240,7 @@ func (c *Config) initSettings() {
// Settings returns the current user settings. // Settings returns the current user settings.
func (c *Config) Settings() *Settings { func (c *Config) Settings() *Settings {
if c.settings == nil { c.initSettings()
c.initSettings()
}
if c.DisablePlaces() { if c.DisablePlaces() {
c.settings.Features.Places = false c.settings.Features.Places = false