Merge pull request #108 from umar456/fix_regex

Remove extra branch that broke when "rate information unavailable"
This commit is contained in:
streetturtle 2020-01-14 08:54:05 -05:00 committed by GitHub
commit f76542848c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 4 deletions

View File

@ -68,10 +68,8 @@ local function worker(args)
local battery_info = {} local battery_info = {}
local capacities = {} local capacities = {}
for s in stdout:gmatch("[^\r\n]+") do for s in stdout:gmatch("[^\r\n]+") do
local status, charge_str, time = string.match(s, '.+: (%a+), (%d?%d?%d)%%,?.*') local status, charge_str, time = string.match(s, '.+: (%a+), (%d?%d?%d)%%,?(.*)')
if string.match(s, 'rate information') then if status ~= nil then
-- ignore such line
elseif status ~= nil then
table.insert(battery_info, { status = status, charge = tonumber(charge_str) }) table.insert(battery_info, { status = status, charge = tonumber(charge_str) })
else else
local cap_str = string.match(s, '.+:.+last full capacity (%d+)') local cap_str = string.match(s, '.+:.+last full capacity (%d+)')