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

chore: simplify flag handling (#18536)

Browse source
This commit is contained in:
andig 2025-02-01 20:56:44 +01:00 • committed by GitHub
parent 1bfcc19f0d
commit b7a9abb643
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

12
cmd/charger.go
View file

@ -45,7 +45,7 @@ func runCharger(cmd *cobra.Command, args []string) {
} }
var phases int var phases int
if flag := cmd.Flags().Lookup(flagPhases); flag.Changed { if flag := cmd.Flag(flagPhases); flag.Changed {
var err error var err error
phases, err = strconv.Atoi(flag.Value.String()) phases, err = strconv.Atoi(flag.Value.String())
if err != nil { if err != nil {
@ -57,7 +57,7 @@ func runCharger(cmd *cobra.Command, args []string) {
var flagUsed bool var flagUsed bool
for _, v := range config.Instances(chargers) { for _, v := range config.Instances(chargers) {
if flag := cmd.Flags().Lookup(flagCurrent); flag.Changed { if flag := cmd.Flag(flagCurrent); flag.Changed {
flagUsed = true flagUsed = true
current, err := strconv.ParseFloat(flag.Value.String(), 64) current, err := strconv.ParseFloat(flag.Value.String(), 64)
@ -76,7 +76,7 @@ func runCharger(cmd *cobra.Command, args []string) {
} }
} }
if cmd.Flags().Lookup(flagEnable).Changed { if cmd.Flag(flagEnable).Changed {
flagUsed = true flagUsed = true
if err := v.Enable(true); err != nil { if err := v.Enable(true); err != nil {
@ -84,7 +84,7 @@ func runCharger(cmd *cobra.Command, args []string) {
} }
} }
if cmd.Flags().Lookup(flagDisable).Changed { if cmd.Flag(flagDisable).Changed {
flagUsed = true flagUsed = true
if err := v.Enable(false); err != nil { if err := v.Enable(false); err != nil {
@ -92,7 +92,7 @@ func runCharger(cmd *cobra.Command, args []string) {
} }
} }
if cmd.Flags().Lookup(flagWakeup).Changed { if cmd.Flag(flagWakeup).Changed {
flagUsed = true flagUsed = true
if vv, ok := v.(api.Resurrector); ok { if vv, ok := v.(api.Resurrector); ok {
@ -119,7 +119,7 @@ func runCharger(cmd *cobra.Command, args []string) {
if !flagUsed { if !flagUsed {
d := dumper{len: len(chargers)} d := dumper{len: len(chargers)}
flag := cmd.Flags().Lookup(flagDiagnose).Changed flag := cmd.Flag(flagDiagnose).Changed
for _, dev := range chargers { for _, dev := range chargers {
v := dev.Instance() v := dev.Instance()

4
cmd/charger_ramp.go
View file

@ -79,12 +79,12 @@ func runChargerRamp(cmd *cobra.Command, args []string) {
log.FATAL.Fatal(err) log.FATAL.Fatal(err)
} }
digits, err := strconv.Atoi(cmd.Flags().Lookup(flagDigits).Value.String()) digits, err := strconv.Atoi(cmd.Flag(flagDigits).Value.String())
if err != nil { if err != nil {
log.ERROR.Fatalln(err) log.ERROR.Fatalln(err)
} }
delay, err := time.ParseDuration(cmd.Flags().Lookup(flagDelay).Value.String()) delay, err := time.ParseDuration(cmd.Flag(flagDelay).Value.String())
if err != nil { if err != nil {
log.ERROR.Fatalln(err) log.ERROR.Fatalln(err)
} }

2
cmd/flags.go
View file

@ -59,7 +59,7 @@ func bind(cmd *cobra.Command, key string, flagName ...string) {
if len(flagName) == 1 { if len(flagName) == 1 {
name = flagName[0] name = flagName[0]
} }
if err := viper.BindPFlag(key, cmd.Flags().Lookup(name)); err != nil { if err := viper.BindPFlag(key, cmd.Flag(name)); err != nil {
panic(err) panic(err)
} }
} }

2
cmd/meter.go
View file

@ -39,7 +39,7 @@ func runMeter(cmd *cobra.Command, args []string) {
} }
mode := api.BatteryUnknown mode := api.BatteryUnknown
if val := cmd.Flags().Lookup(flagBatteryMode).Value.String(); val != "" { if val := cmd.Flag(flagBatteryMode).Value.String(); val != "" {
var err error var err error
mode, err = api.BatteryModeString(val) mode, err = api.BatteryModeString(val)
if err != nil { if err != nil {

2
cmd/migrate.go
View file

@ -32,7 +32,7 @@ func runMigrate(cmd *cobra.Command, args []string) {
log.FATAL.Fatal(err) log.FATAL.Fatal(err)
} }
reset := cmd.Flags().Lookup(flagReset).Changed reset := cmd.Flag(flagReset).Changed
// TODO remove yaml file // TODO remove yaml file
if reset { if reset {

2
cmd/ocpp/main.go
View file

@ -37,7 +37,7 @@ func main() {
} }
func runOcpp(cmd *cobra.Command, args []string) { func runOcpp(cmd *cobra.Command, args []string) {
url := cmd.Flags().Lookup("uri").Value.String() url := cmd.Flag("uri").Value.String()
if len(args) > 0 { if len(args) > 0 {
chargePointId = args[0] chargePointId = args[0]

2
cmd/setup.go
View file

@ -469,7 +469,7 @@ func configureSponsorship(token string) (err error) {
func configureEnvironment(cmd *cobra.Command, conf *globalconfig.All) (err error) { func configureEnvironment(cmd *cobra.Command, conf *globalconfig.All) (err error) {
// full http request log // full http request log
if cmd.Flags().Lookup(flagHeaders).Changed { if cmd.Flag(flagHeaders).Changed {
request.LogHeaders = true request.LogHeaders = true
} }

12
cmd/vehicle.go
View file

@ -38,7 +38,7 @@ func runVehicle(cmd *cobra.Command, args []string) {
} }
// use cloud // use cloud
if cmd.Flags().Lookup(flagCloud).Changed { if cmd.Flag(flagCloud).Changed {
for _, conf := range conf.Vehicles { for _, conf := range conf.Vehicles {
conf.Other["cloud"] = "true" conf.Other["cloud"] = "true"
} }
@ -52,7 +52,7 @@ func runVehicle(cmd *cobra.Command, args []string) {
var flagUsed bool var flagUsed bool
for _, v := range config.Instances(vehicles) { for _, v := range config.Instances(vehicles) {
if flag := cmd.Flags().Lookup(flagCurrent); flag.Changed { if flag := cmd.Flag(flagCurrent); flag.Changed {
flagUsed = true flagUsed = true
f, err := strconv.ParseFloat(flag.Value.String(), 64) f, err := strconv.ParseFloat(flag.Value.String(), 64)
@ -73,7 +73,7 @@ func runVehicle(cmd *cobra.Command, args []string) {
} }
} }
if cmd.Flags().Lookup(flagWakeup).Changed { if cmd.Flag(flagWakeup).Changed {
flagUsed = true flagUsed = true
if vv, ok := v.(api.Resurrector); ok { if vv, ok := v.(api.Resurrector); ok {
@ -85,7 +85,7 @@ func runVehicle(cmd *cobra.Command, args []string) {
} }
} }
if cmd.Flags().Lookup(flagStart).Changed { if cmd.Flag(flagStart).Changed {
flagUsed = true flagUsed = true
if vv, ok := v.(api.ChargeController); ok { if vv, ok := v.(api.ChargeController); ok {
@ -97,7 +97,7 @@ func runVehicle(cmd *cobra.Command, args []string) {
} }
} }
if cmd.Flags().Lookup(flagStop).Changed { if cmd.Flag(flagStop).Changed {
flagUsed = true flagUsed = true
if vv, ok := v.(api.ChargeController); ok { if vv, ok := v.(api.ChargeController); ok {
@ -112,7 +112,7 @@ func runVehicle(cmd *cobra.Command, args []string) {
if !flagUsed { if !flagUsed {
d := dumper{len: len(vehicles)} d := dumper{len: len(vehicles)}
flag := cmd.Flags().Lookup(flagDiagnose).Changed flag := cmd.Flag(flagDiagnose).Changed
for _, dev := range vehicles { for _, dev := range vehicles {
v := dev.Instance() v := dev.Instance()