From 25ce79e4e5c5bad03359ddaa3ca8b3ceb91f2c4f Mon Sep 17 00:00:00 2001 From: "Adrian C. (anrxc)" Date: Thu, 15 Oct 2009 23:38:55 +0200 Subject: 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. --- batat.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/batat.lua b/batat.lua index 2e40d9f..860eb26 100644 --- a/batat.lua +++ b/batat.lua @@ -33,12 +33,12 @@ local function worker(format) -- Check if the battery is present if string.match(line, "^[%s]+Battery.*") then -- Store state and charge information - table.insert(battery_info, (battery_state[string.match(line, "([%a]*),")] or "/")) - table.insert(battery_info, (string.match(line, "([%d]?[%d]?[%d])%.") or "/")) + table.insert(battery_info, (battery_state[string.match(line, "([%a]*),") or "unknown"])) + table.insert(battery_info, (string.match(line, "([%d]?[%d]?[%d])%.") or "0")) -- 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 - return {"/", "/", "/"} + return {battery_state["unknown"], "0", "N/A"} end end f:close() -- cgit v1.2.3