l.behm/bumblebee-status
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #890 from anarcat/upower-no-bat

Browse source 
handle missing battery case
This commit is contained in:
tobi-wan-kenobi 2022-06-20 17:37:04 +02:00 committed by GitHub
commit df9890690a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
bumblebee_status/modules/contrib/battery-upower.py
View file

@ -207,6 +207,12 @@ class UPowerManager:
data = upower_interface.GetTotal() data = upower_interface.GetTotal()
return data return data
def is_battery_present(self, battery):
battery_proxy = self.bus.get_object(self.UPOWER_NAME, battery)
battery_proxy_interface = dbus.Interface(battery_proxy, self.DBUS_PROPERTIES)
return bool(battery_proxy_interface.Get(self.UPOWER_NAME + ".Device", "IsPresent"))
def is_loading(self, battery): def is_loading(self, battery):
battery_proxy = self.bus.get_object(self.UPOWER_NAME, battery) battery_proxy = self.bus.get_object(self.UPOWER_NAME, battery)
battery_proxy_interface = dbus.Interface(battery_proxy, self.DBUS_PROPERTIES) battery_proxy_interface = dbus.Interface(battery_proxy, self.DBUS_PROPERTIES)
@ -259,6 +265,11 @@ class Module(core.module.Module):
widget.set("capacity", -1) widget.set("capacity", -1)
widget.set("ac", False) widget.set("ac", False)
output = "n/a" output = "n/a"
if not self.power.is_battery_present(self.device):
widget.set("ac", True)
widget.set("capacity", 100)
output = "ac"
return output
try: try:
capacity = int(self.power.get_device_percentage(self.device)) capacity = int(self.power.get_device_percentage(self.device))
capacity = capacity if capacity < 100 else 100 capacity = capacity if capacity < 100 else 100