Merge conflict resolutions in Parsers.hs and Batt.hs

Ignore-this: 12bf0ec7afc4ac855a69375ee1b3d163

darcs-hash:20100214191544-748be-68a449772d3eb68cc059bbeec955f81258c71d70.gz

1 files changed, 33 insertions, 23 deletions

diff --git a/Plugins/Monitors/Batt.hs b/Plugins/Monitors/Batt.hs
index 4d3f540..6ea62a9 100644
--- a/Plugins/Monitors/Batt.hs
+++ b/Plugins/Monitors/Batt.hs
@@ -18,37 +18,47 @@ import qualified Data.ByteString.Lazy.Char8 as B
 import Plugins.Monitors.Common
 import System.Posix.Files (fileExist)
 
-data Batt = Batt Float
+data Batt = Batt Float String
           | NA
 
 battConfig :: IO MConfig
 battConfig = mkMConfig
        "Batt: <left>" -- template
-       ["left"]       -- available replacements
+       ["left","status"] -- available replacements
 
-file2batfile :: String -> (String, String)
-file2batfile s = ("/proc/acpi/battery/"++ s ++ "/info", "/proc/acpi/battery/"++ s ++ "/state")
+type File = (String, String)
 
-readFileBatt :: (String, String) -> IO (B.ByteString, B.ByteString)
-readFileBatt (i,s) =
-    do a <- rf i
-       b <- rf s
-       return (a,b)
+file2batfile :: String -> (File, File)
+file2batfile s = ( (s' ++ "/charge_full", s' ++ "/energy_full")
+                 , (s' ++ "/charge_now" , s' ++ "/energy_now" )
+                 )
+    where s' = "/sys/class/power_supply/" ++ s
+
+readFileBatt :: (File, File) -> IO (String, String, String)
+readFileBatt (f,n) =
+    do a  <- rf f
+       b  <- rf n
+       ac <- fileExist "/sys/class/power_supply/AC0/online"
+       c  <- if not ac
+             then return []
+             else do s <- B.unpack `fmap` catRead "/sys/class/power_supply/AC0/online"
+                     return $ if s == "1\n" then "<fc=green>On</fc>" else"<fc=red>Off</fc>"
+       return (a,b,c)
     where rf file = do
-            f <- fileExist file
-            if f then catRead file else return B.empty
+            fe <- fileExist (fst file)
+            if fe
+               then B.unpack `fmap` catRead (fst file)
+               else do fe' <- fileExist (snd file)
+                       if fe'
+                          then B.unpack `fmap` catRead (snd file)
+                          else return []
 
-parseBATT :: [(String, String)] -> IO Batt
+parseBATT :: [(File,File)] -> IO Batt
 parseBATT bfs =
-    do [(a0,b0),(a1,b1),(a2,b2)] <- mapM readFileBatt (take 3 $ bfs ++ repeat ("",""))
-       let sp p s = case stringParser p s of
-                      [] -> 0
-                      x -> read x
-           (f0, p0) = (sp (3,2) a0, sp (2,4) b0)
-           (f1, p1) = (sp (3,2) a1, sp (2,4) b1)
-           (f2, p2) = (sp (3,2) a2, sp (2,4) b2)
-           left = (p0 + p1 + p2) / (f0 + f1 + f2) --present / full
-       return $ if isNaN left then NA else Batt left
+    do [(a0,b0,c0),(a1,b1,_),(a2,b2,_)] <- mapM readFileBatt (take 3 $ bfs ++ repeat (("",""),("","")))
+       let read' s = if s == [] then 0 else read s
+           left    = (read' b0 + read' b1 + read' b2) / (read' a0 + read' a1 + read' a2) --present / full
+       return $ if isNaN left then NA else Batt left c0
 
 formatBatt :: Float -> Monitor [String]
 formatBatt x = showPercentsWithColors [x]
@@ -60,6 +70,6 @@ runBatt' :: [String] -> [String] -> Monitor String
 runBatt' bfs _ = do
   c <- io $ parseBATT (map file2batfile bfs)
   case c of
-    Batt x -> do l <- formatBatt x
-                 parseTemplate l
+    Batt x s -> do l <- formatBatt x
+                   parseTemplate (l ++ [s])
     NA -> return "N/A"