diff options
| author | Sean E. Russell <ser@ser1.net> | 2020-02-24 10:03:08 -0600 |
|---|---|---|
| committer | Sean E. Russell <ser@ser1.net> | 2020-02-24 10:03:08 -0600 |
| commit | 1375dce1be7710b0967169fb3bc64bfc54777e60 (patch) | |
| tree | 66327cec9cad7462d92fc995387681cc59ee272d /widgets | |
| parent | 3fb29b5ecf9ddf4de51681623be4886b235754a4 (diff) | |
| parent | 39dc97b37f710092e1db042b37dd5f9847997336 (diff) | |
Merge branch 'master' into nvidia
Diffstat (limited to 'widgets')
| -rw-r--r-- | widgets/battery.go | 21 | ||||
| -rw-r--r-- | widgets/net.go | 1 | ||||
| -rw-r--r-- | widgets/temp.go | 2 |
3 files changed, 22 insertions, 2 deletions
diff --git a/widgets/battery.go b/widgets/battery.go index 89620bb..00764c0 100644 --- a/widgets/battery.go +++ b/widgets/battery.go @@ -52,8 +52,25 @@ func (b *BatteryWidget) Scale(i int) { func (self *BatteryWidget) update() { batteries, err := battery.GetAll() if err != nil { - log.Printf("failed to get battery info: %v", err) - return + switch errt := err.(type) { + case battery.ErrFatal: + log.Printf("fatal error fetching battery info: %v", err) + return + case battery.Errors: + batts := make([]*battery.Battery, 0) + for i, e := range errt { + if e == nil { + batts = append(batts, batteries[i]) + } else { + log.Printf("recoverable error fetching battery info; skipping battery: %v", e) + } + } + if len(batts) < 1 { + log.Print("no usable batteries found") + return + } + batteries = batts + } } for i, battery := range batteries { id := makeId(i) diff --git a/widgets/net.go b/widgets/net.go index c4ac8e8..ba2660d 100644 --- a/widgets/net.go +++ b/widgets/net.go @@ -27,6 +27,7 @@ type NetWidget struct { NetInterface []string } +// TODO: state:merge #169 % option for network use (jrswab/networkPercentage) func NewNetWidget(netInterface string) *NetWidget { recvSparkline := ui.NewSparkline() recvSparkline.Data = []int{} diff --git a/widgets/temp.go b/widgets/temp.go index 86e6e76..7c0a358 100644 --- a/widgets/temp.go +++ b/widgets/temp.go @@ -29,6 +29,7 @@ type TempWidget struct { TempScale TempScale } +// TODO: state:deferred 156 Added temperatures for NVidia GPUs (azak-azkaran/master). Crashes on non-nvidia machines. func NewTempWidget(tempScale TempScale) *TempWidget { self := &TempWidget{ Block: ui.NewBlock(), @@ -84,6 +85,7 @@ func (self *TempWidget) Draw(buf *ui.Buffer) { image.Pt(self.Inner.Min.X, self.Inner.Min.Y+y), ) + // TODO: state:merge #184 or #177 degree symbol (BartWillems/master, fleaz/master) switch self.TempScale { case Fahrenheit: buf.SetString( |