mudhorn/oh-my-posh
1
0
Fork 0
mirror of https://github.com/JanDeDobbeleer/oh-my-posh.git synced 2025-03-05 20:49:04 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

refactor: refactored ignoreErr func to return bool value

Browse source
This commit is contained in:
Khaos66 2021-12-11 13:51:15 +01:00 committed by Jan De Dobbeleer
parent 6893008467
commit 403bf12401
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/environment.go
View file

@ -403,25 +403,25 @@ func (env *environment) getBatteryInfo() ([]*battery.Battery, error) {
unableToRetrieveBatteryInfo := "A device which does not exist was specified." unableToRetrieveBatteryInfo := "A device which does not exist was specified."
unknownChargeRate := "Unknown value received" unknownChargeRate := "Unknown value received"
var fatalErr battery.Errors var fatalErr battery.Errors
ignoreErr := func(err error) error { ignoreErr := func(err error) bool {
if e, ok := err.(battery.ErrPartial); ok { if e, ok := err.(battery.ErrPartial); ok {
// ignore errors unknown charge rate value // ignore unknown charge rate value error
if e.Current == nil && if e.Current == nil &&
e.Design == nil && e.Design == nil &&
e.DesignVoltage == nil && e.DesignVoltage == nil &&
e.Full == nil && e.Full == nil &&
e.State == nil && e.State == nil &&
e.Voltage == nil && e.Voltage == nil &&
e.ChargeRate != nil &&
e.ChargeRate.Error() == unknownChargeRate { e.ChargeRate.Error() == unknownChargeRate {
return nil return true
} }
} }
return err return false
} }
if batErr, ok := err.(battery.Errors); ok { if batErr, ok := err.(battery.Errors); ok {
for _, err := range batErr { for _, err := range batErr {
err = ignoreErr(err) if !ignoreErr(err) {
if err != nil {
fatalErr = append(fatalErr, err) fatalErr = append(fatalErr, err)
} }
} }