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

chore: refactor selection by name

Browse source
This commit is contained in:
andig 2022-03-15 11:28:13 +00:00
parent 7a7f787f11
commit e1902c12fa
4 changed files with 31 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

9
cmd/charger.go
View file

@ -54,13 +54,8 @@ func runCharger(cmd *cobra.Command, args []string) {
}
// select single charger
if name := cmd.PersistentFlags().Lookup(flagName).Value.String(); name != "" {
for _, cfg := range conf.Chargers {
if cfg.Name == name {
conf.Chargers = []qualifiedConfig{cfg}
break
}
}
if err := selectByName(cmd, &conf.Chargers); err != nil {
log.FATAL.Fatal(err)
}
if err := cp.configureChargers(conf); err != nil {

24
cmd/flags.go
View file

@ -1,5 +1,11 @@
package cmd
import (
"fmt"
"github.com/spf13/cobra"
)
const (
flagHeaders = "log-headers"
flagHeadersDescription = "Log headers"
@ -22,3 +28,21 @@ const (
flagStop = "stop"
flagStopDescription = "Stop charging"
)
func selectByName(cmd *cobra.Command, conf *[]qualifiedConfig) error {
flag := cmd.PersistentFlags().Lookup(flagName)
if !flag.Changed {
return nil
}
name := flag.Value.String()
for _, cfg := range *conf {
if cfg.Name == name {
*conf = []qualifiedConfig{cfg}
return nil
}
}
return fmt.Errorf("%s not found", name)
}

9
cmd/meter.go
View file

@ -45,13 +45,8 @@ func runMeter(cmd *cobra.Command, args []string) {
}
// select single meter
if name := cmd.PersistentFlags().Lookup("name").Value.String(); name != "" {
for _, cfg := range conf.Meters {
if cfg.Name == name {
conf.Meters = []qualifiedConfig{cfg}
break
}
}
if err := selectByName(cmd, &conf.Meters); err != nil {
log.FATAL.Fatal(err)
}
if err := cp.configureMeters(conf); err != nil {

11
cmd/vehicle.go
View file

@ -47,14 +47,9 @@ func runVehicle(cmd *cobra.Command, args []string) {
request.LogHeaders = true
}
// select single charger
if name := cmd.PersistentFlags().Lookup(flagName).Value.String(); name != "" {
for _, cfg := range conf.Vehicles {
if cfg.Name == name {
conf.Vehicles = []qualifiedConfig{cfg}
break
}
}
// select single vehicle
if err := selectByName(cmd, &conf.Vehicles); err != nil {
log.FATAL.Fatal(err)
}
if err := cp.configureVehicles(conf); err != nil {