batat: better returns when handling insufficient data
If we return "N/A" like we usually do then format string "$1$2" would look like "N/AN/A". If "/" is returned a progressbar could be broken. Now returns are: symbol for state "unknown", 0 for battery charge, N/A for remaining time.
This commit is contained in:
parent
baa3612828
commit
25ce79e4e5
|
@ -33,12 +33,12 @@ local function worker(format)
|
||||||
-- Check if the battery is present
|
-- Check if the battery is present
|
||||||
if string.match(line, "^[%s]+Battery.*") then
|
if string.match(line, "^[%s]+Battery.*") then
|
||||||
-- Store state and charge information
|
-- Store state and charge information
|
||||||
table.insert(battery_info, (battery_state[string.match(line, "([%a]*),")] or "/"))
|
table.insert(battery_info, (battery_state[string.match(line, "([%a]*),") or "unknown"]))
|
||||||
table.insert(battery_info, (string.match(line, "([%d]?[%d]?[%d])%.") or "/"))
|
table.insert(battery_info, (string.match(line, "([%d]?[%d]?[%d])%.") or "0"))
|
||||||
-- Store remaining time information
|
-- Store remaining time information
|
||||||
table.insert(battery_info, (string.match(line, "%%,%s(.*)") or "/"))
|
table.insert(battery_info, (string.match(line, "%%,%s(.*)") or "N/A"))
|
||||||
else
|
else
|
||||||
return {"/", "/", "/"}
|
return {battery_state["unknown"], "0", "N/A"}
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
f:close()
|
f:close()
|
||||||
|
|
Loading…
Reference in New Issue