Stefan/evcc-io
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: use yamlsource (#27466)

Browse source 
Co-authored-by: Michael Geers <michael@geers.tv>
This commit is contained in:
Maschga 2026-02-17 10:47:43 +01:00 • committed by GitHub
parent 50c5e9ac97
commit 9293cdef3e
13 changed files with 60 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

15
cmd/setup.go
View file

@ -81,10 +81,10 @@ var conf = globalconfig.All{
},
}
var fromYaml struct {
sponsor bool
hems bool
eebus bool
var yamlSource struct {
sponsor globalconfig.YamlSource
hems globalconfig.YamlSource
eebus globalconfig.YamlSource
}
var nameRE = regexp.MustCompile(`^[a-zA-Z0-9_.:-]+$`)
@ -505,7 +505,7 @@ func configureSponsorship(token string) (err error) {
return err
}
} else if token != "" {
fromYaml.sponsor = true
yamlSource.sponsor = globalconfig.YamlSourceFile
}
return sponsor.ConfigureSponsorship(token)
@ -715,9 +715,10 @@ func configureHEMS(conf *globalconfig.Hems, site *core.Site) (hemsapi.API, error
if err := settings.Yaml(keys.Hems, new(map[string]any), &conf); err != nil {
return nil, err
}
yamlSource.hems = globalconfig.YamlSourceDb
}
} else {
fromYaml.hems = true
yamlSource.hems = globalconfig.YamlSourceFile
}
if conf.Type == "" {
@ -785,7 +786,7 @@ func configureEEBus(conf *eebus.Config) error {
return err
}
} else if conf.IsConfigured() {
fromYaml.eebus = true
yamlSource.eebus = globalconfig.YamlSourceFile
}
if !conf.IsConfigured() {