From 51ddb1efba57b4c41addd3a00b87bce2c2443741 Mon Sep 17 00:00:00 2001 From: Andreas Longo Date: Tue, 15 Feb 2022 18:03:08 +0100 Subject: Fix #209: Match space characters in battery status string --- battery-widget/battery.lua | 2 +- batteryarc-widget/batteryarc.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/battery-widget/battery.lua b/battery-widget/battery.lua index fc8c56f..ed44d5c 100644 --- a/battery-widget/battery.lua +++ b/battery-widget/battery.lua @@ -125,7 +125,7 @@ local function worker(user_args) local battery_info = {} local capacities = {} for s in stdout:gmatch("[^\r\n]+") do - local status, charge_str, _ = string.match(s, '.+: (%a+), (%d?%d?%d)%%,?(.*)') + local status, charge_str, _ = string.match(s, '.+: ([%a%s]+), (%d?%d?%d)%%,?(.*)') if status ~= nil then table.insert(battery_info, {status = status, charge = tonumber(charge_str)}) else diff --git a/batteryarc-widget/batteryarc.lua b/batteryarc-widget/batteryarc.lua index 1b6752a..3d38af4 100644 --- a/batteryarc-widget/batteryarc.lua +++ b/batteryarc-widget/batteryarc.lua @@ -89,7 +89,7 @@ local function worker(user_args) local charge = 0 local status for s in stdout:gmatch("[^\r\n]+") do - local cur_status, charge_str, _ = string.match(s, '.+: (%a+), (%d?%d?%d)%%,?(.*)') + local cur_status, charge_str, _ = string.match(s, '.+: ([%a%s]+), (%d?%d?%d)%%,?(.*)') if cur_status ~= nil and charge_str ~=nil then local cur_charge = tonumber(charge_str) if cur_charge > charge then -- cgit v1.2.3