tyler.durden
/
powerline
mirror of https://github.com/powerline/powerline.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1486 from michelesr/develop 

Fix #1483 -- [Battery - Linux] Fix AC status fetch
This commit is contained in:
Nikolai Aleksandrovich Pavlov 2015-11-08 18:10:28 +03:00
parent 5364919b47 2063411d34
commit 4e7f39926a
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
powerline/segments/common/bat.py
View File

@ -62,19 +62,25 @@ def _fetch_battery_info(pl):
pl.debug('Not using DBUS+UPower as no batteries were found') pl.debug('Not using DBUS+UPower as no batteries were found')
if os.path.isdir('/sys/class/power_supply'): if os.path.isdir('/sys/class/power_supply'):
linux_bat_fmt = '/sys/class/power_supply/{0}/capacity' online_path_verified = None
linux_supplier_fmt = '/sys/class/power_supply/{0}/capacity'
linux_ac_fmt = '/sys/class/power_supply/{0}/online' linux_ac_fmt = '/sys/class/power_supply/{0}/online'
for linux_bat in os.listdir('/sys/class/power_supply'): for linux_supplier in os.listdir('/sys/class/power_supply'):
cap_path = linux_bat_fmt.format(linux_bat) cap_path = linux_supplier_fmt.format(linux_supplier)
online_path = linux_ac_fmt.format(linux_bat) online_path = linux_ac_fmt.format(linux_supplier)
if linux_bat.startswith('BAT') and os.path.exists(cap_path): if linux_supplier.startswith('AC') and os.path.exists(online_path):
pl.debug('Using /sys/class/power_supply with battery {0}', linux_bat) pl.debug('Using /sys/class/power_supply with AC {0}', online_path)
online_path_verified = online_path
elif linux_supplier.startswith('BAT') and os.path.exists(cap_path):
pl.debug('Using /sys/class/power_supply with battery {0}', linux_supplier)
def _get_battery_status(pl): def _get_battery_status(pl):
_ac_powered = None
with open(cap_path, 'r') as f: with open(cap_path, 'r') as f:
_capacity = int(float(f.readline().split()[0])) _capacity = int(float(f.readline().split()[0]))
with open(online_path, 'r') as f: if online_path_verified:
_ac_powered = f.readline() == 1 with open(online_path_verified, 'r') as f:
_ac_powered = int(f.readline()) == 1
return _capacity, _ac_powered return _capacity, _ac_powered
return _get_battery_status return _get_battery_status
pl.debug('Not using /sys/class/power_supply as no batteries were found') pl.debug('Not using /sys/class/power_supply as no batteries were found')