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

fix(battery): ignore UnknownChareRate error

Browse source 
This error is returned when Windows can't get the charge rate from the battery
This commit is contained in:
Khaos66 2021-12-11 12:13:27 +01:00 committed by Jan De Dobbeleer
parent c67148670c
commit 63b20f7e43
1 changed files with 31 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/environment.go
View file

@ -399,15 +399,42 @@ func (env *environment) getBatteryInfo() ([]*battery.Battery, error) {
validBatteries = append(validBatteries, batt) validBatteries = append(validBatteries, batt)
} }
} }
// clean minor errors
unableToRetrieveBatteryInfo := "A device which does not exist was specified." unableToRetrieveBatteryInfo := "A device which does not exist was specified."
unknownChargeRate := "Unknown value received"
var fatalErr battery.Errors
ignoreErr := func(err error) error {
if e, ok := err.(battery.ErrPartial); ok {
// ignore errors unknown charge rate value
if e.Current == nil &&
e.Design == nil &&
e.DesignVoltage == nil &&
e.Full == nil &&
e.State == nil &&
e.Voltage == nil &&
e.ChargeRate.Error() == unknownChargeRate {
return nil
}
}
return err
}
if batErr, ok := err.(battery.Errors); ok {
for _, err := range batErr {
err = ignoreErr(err)
if err != nil {
fatalErr = append(fatalErr, err)
}
}
}
// when battery info fails to get retrieved but there is at least one valid battery, return it without error // when battery info fails to get retrieved but there is at least one valid battery, return it without error
if len(validBatteries) > 0 && err != nil && strings.Contains(err.Error(), unableToRetrieveBatteryInfo) { if len(validBatteries) > 0 && fatalErr != nil && strings.Contains(fatalErr.Error(), unableToRetrieveBatteryInfo) {
return validBatteries, nil return validBatteries, nil
} }
// another error occurred (possibly unmapped use-case), return it // another error occurred (possibly unmapped use-case), return it
if err != nil { if fatalErr != nil {
env.log(Error, "getBatteryInfo", err.Error()) env.log(Error, "getBatteryInfo", fatalErr.Error())
return nil, err return nil, fatalErr
} }
// everything is fine // everything is fine
return validBatteries, nil return validBatteries, nil