Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

upower backend for battery widget WIP #266

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

upower backend for battery widget WIP #266

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
703f7e2
upower backend for battery widget
eylles May 24, 2021
1a4f8e0
use time to full charge to decide if charging icon, cleaned up upower…
eylles May 25, 2021
1d74d69
added notification with upower backend
eylles Dec 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
197 changes: 133 additions & 64 deletions battery-widget/battery.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ local function worker(user_args)
local show_current_level = args.show_current_level or false
local margin_left = args.margin_left or 0
local margin_right = args.margin_right or 0
local battery_backend = args.battery_backend or "acpi"

local display_notification = args.display_notification or false
local display_notification_onClick = args.display_notification_onClick or true
Expand Down Expand Up @@ -77,21 +78,39 @@ local function worker(user_args)
-- One way of creating a pop-up notification - naughty.notify
local notification
local function show_battery_status(batteryType)
awful.spawn.easy_async([[bash -c 'acpi']],
function(stdout, _, _, _)
naughty.destroy(notification)
notification = naughty.notify{
text = stdout,
title = "Battery status",
icon = path_to_icons .. batteryType .. ".svg",
icon_size = dpi(16),
position = position,
timeout = 5, hover_timeout = 0.5,
width = 200,
screen = mouse.screen
}
if battery_backend == "acpi" then
awful.spawn.easy_async([[bash -c 'acpi']],
function(stdout, _, _, _)
naughty.destroy(notification)
notification = naughty.notify{
text = stdout,
title = "Battery status",
icon = path_to_icons .. batteryType .. ".svg",
icon_size = dpi(16),
position = position,
timeout = 5, hover_timeout = 0.5,
width = 200,
screen = mouse.screen
}
end
)
elseif battery_backend == "upower" then
awful.spawn.easy_async({ awful.util.shell, "-c", [[ upower -i $(upower -e | grep BAT) | awk '{ if ($1 == "native-path:") {print $2} else if ($1 == "percentage:") {print $2} else if ($1 == "state:") {print $2} else if ($1 == "time") {print $4" "$5} }' ]] },
function(stdout, _, _, _)
naughty.destroy(notification)
notification = naughty.notify{
text = stdout,
title = "Battery status",
icon = path_to_icons .. batteryType .. ".svg",
icon_size = dpi(16),
position = position,
timeout = 5, hover_timeout = 0.5,
width = 200,
screen = mouse.screen
}
end
)
end
)
end

-- Alternative to naughty.notify - tooltip. You can compare both and choose the preferred one
Expand Down Expand Up @@ -120,69 +139,119 @@ local function worker(user_args)
local last_battery_check = os.time()
local batteryType = "battery-good-symbolic"

watch("acpi -i", timeout,
function(widget, stdout)
local battery_info = {}
local capacities = {}
for s in stdout:gmatch("[^\r\n]+") do
local status, charge_str, _ = string.match(s, '.+: (%a+), (%d?%d?%d)%%,?(.*)')
if status ~= nil then
table.insert(battery_info, {status = status, charge = tonumber(charge_str)})
else
local cap_str = string.match(s, '.+:.+last full capacity (%d+)')
table.insert(capacities, tonumber(cap_str))
if battery_backend == "acpi" then
watch("acpi -i", timeout,
function(widget, stdout)
local battery_info = {}
local capacities = {}
for s in stdout:gmatch("[^\r\n]+") do
local status, charge_str, _ = string.match(s, '.+: (%a+), (%d?%d?%d)%%,?(.*)')
if status ~= nil then
table.insert(battery_info, {status = status, charge = tonumber(charge_str)})
else
local cap_str = string.match(s, '.+:.+last full capacity (%d+)')
table.insert(capacities, tonumber(cap_str))
end
end
end

local capacity = 0
for _, cap in ipairs(capacities) do
capacity = capacity + cap
end
local capacity = 0
for _, cap in ipairs(capacities) do
capacity = capacity + cap
end

local charge = 0
local status
for i, batt in ipairs(battery_info) do
if capacities[i] ~= nil then
if batt.charge >= charge then
status = batt.status -- use most charged battery status
-- this is arbitrary, and maybe another metric should be used
end

local charge = 0
local status
for i, batt in ipairs(battery_info) do
if capacities[i] ~= nil then
if batt.charge >= charge then
status = batt.status -- use most charged battery status
-- this is arbitrary, and maybe another metric should be used
charge = charge + batt.charge * capacities[i]
end
end
charge = charge / capacity

charge = charge + batt.charge * capacities[i]
if show_current_level then
level_widget.text = string.format('%d%%', charge)
end
end
charge = charge / capacity

if show_current_level then
level_widget.text = string.format('%d%%', charge)
end
if (charge >= 0 and charge < 15) then
batteryType = "battery-empty%s-symbolic"
if enable_battery_warning and status ~= 'Charging' and os.difftime(os.time(), last_battery_check) > 300 then
-- if 5 minutes have elapsed since the last warning
last_battery_check = os.time()

if (charge >= 0 and charge < 15) then
batteryType = "battery-empty%s-symbolic"
if enable_battery_warning and status ~= 'Charging' and os.difftime(os.time(), last_battery_check) > 300 then
-- if 5 minutes have elapsed since the last warning
last_battery_check = os.time()
show_battery_warning()
end
elseif (charge >= 15 and charge < 40) then batteryType = "battery-caution%s-symbolic"
elseif (charge >= 40 and charge < 60) then batteryType = "battery-low%s-symbolic"
elseif (charge >= 60 and charge < 80) then batteryType = "battery-good%s-symbolic"
elseif (charge >= 80 and charge <= 100) then batteryType = "battery-full%s-symbolic"
end

show_battery_warning()
if status == 'Charging' then
batteryType = string.format(batteryType, '-charging')
else
batteryType = string.format(batteryType, '')
end
elseif (charge >= 15 and charge < 40) then batteryType = "battery-caution%s-symbolic"
elseif (charge >= 40 and charge < 60) then batteryType = "battery-low%s-symbolic"
elseif (charge >= 60 and charge < 80) then batteryType = "battery-good%s-symbolic"
elseif (charge >= 80 and charge <= 100) then batteryType = "battery-full%s-symbolic"
end

if status == 'Charging' then
batteryType = string.format(batteryType, '-charging')
else
batteryType = string.format(batteryType, '')
end
widget.icon:set_image(path_to_icons .. batteryType .. ".svg")

-- Update popup text
-- battery_popup.text = string.gsub(stdout, "\n$", "")
end,
icon_widget)
elseif battery_backend == "upower" then
watch(
{ awful.util.shell, "-c", "upower -i $(upower -e | grep BAT) | sed -n '/present/,/icon-name/p'" },
timeout,
function(widget, stdout)
local bat_now = {
state = "N/A",
timefull = "N/A",
percentage = "N/A",
}

for k, v in string.gmatch(stdout, '([%a]+[%a|-]+):%s*([%a|%d]+[,|%a|%d]-)') do
if k == "state" then bat_now.state = v
elseif k == 'full' then bat_now.timefull = v
elseif k == "percentage" then bat_now.percentage = tonumber(v) -- %
end
end

-- customize here
local charge = bat_now.percentage
local status = bat_now.state
if show_current_level then
level_widget.text = string.format('%d%%', charge)
end

if (charge >= 0 and charge < 15) then
batteryType = "battery-empty%s-symbolic"
if enable_battery_warning and status ~= 'charging' and os.difftime(os.time(), last_battery_check) > 300 then
-- if 5 minutes have elapsed since the last warning
last_battery_check = os.time()

show_battery_warning()
end
elseif (charge >= 15 and charge < 40) then batteryType = "battery-caution%s-symbolic"
elseif (charge >= 40 and charge < 60) then batteryType = "battery-low%s-symbolic"
elseif (charge >= 60 and charge < 80) then batteryType = "battery-good%s-symbolic"
elseif (charge >= 80 and charge <= 100) then batteryType = "battery-full%s-symbolic"
end

widget.icon:set_image(path_to_icons .. batteryType .. ".svg")
if (status == 'charging' and bat_now.timefull ~= "N/A") then
batteryType = string.format(batteryType, '-charging')
else
batteryType = string.format(batteryType, '')
end

-- Update popup text
-- battery_popup.text = string.gsub(stdout, "\n$", "")
end,
icon_widget)
widget.icon:set_image(path_to_icons .. batteryType .. ".svg")
end,
icon_widget)
end

if display_notification then
battery_widget:connect_signal("mouse::enter", function() show_battery_status(batteryType) end)
Expand Down