diff options
| author | Reto Hablützel <rethab@rethab.ch> | 2014-08-09 21:33:10 +0200 |
|---|---|---|
| committer | jao <jao@gnu.org> | 2014-08-09 23:18:46 +0200 |
| commit | d9b24473ce65c6ce7f5bdea8c7d6eee07a62461e (patch) | |
| tree | f748cd2c2f4df5753955a660044cf28a8737cb16 /src/Plugins/Monitors/Batt.hs | |
| parent | 35054d018c79d4b4da2dd93830dc351d28635242 (diff) | |
| download | xmobar-d9b24473ce65c6ce7f5bdea8c7d6eee07a62461e.tar.gz xmobar-d9b24473ce65c6ce7f5bdea8c7d6eee07a62461e.tar.bz2 | |
hlint refactorings
Diffstat (limited to 'src/Plugins/Monitors/Batt.hs')
| -rw-r--r-- | src/Plugins/Monitors/Batt.hs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/Plugins/Monitors/Batt.hs b/src/Plugins/Monitors/Batt.hs index 3eb2051..ac8cb24 100644 --- a/src/Plugins/Monitors/Batt.hs +++ b/src/Plugins/Monitors/Batt.hs @@ -105,7 +105,7 @@ batteryFiles bat = do is_charge <- exists "charge_now" is_energy <- if is_charge then return False else exists "energy_now" is_power <- exists "power_now" - plain <- if is_charge then exists "charge_full" else exists "energy_full" + plain <- exists (if is_charge then "charge_full" else "energy_full") let cf = if is_power then "power_now" else "current_now" sf = if plain then "" else "_design" return $ case (is_charge, is_energy) of @@ -150,8 +150,9 @@ readBatteries opts bfs = time = if idle then 0 else sum $ map time' bats mwatts = if idle then 1 else sign * watts time' b = (if ac then full b - now b else now b) / mwatts - acstr = if idle then idleString opts else - if ac then onString opts else offString opts + acstr | idle = idleString opts + | ac = onString opts + | otherwise = offString opts return $ if isNaN left then NA else Result left watts time acstr runBatt :: [String] -> Monitor String |