summaryrefslogtreecommitdiffhomepage
path: root/src/Plugins
diff options
context:
space:
mode:
authorJose Antonio Ortega Ruiz <jao@gnu.org>2011-01-25 15:46:29 +0100
committerJose Antonio Ortega Ruiz <jao@gnu.org>2011-01-25 15:46:29 +0100
commit499ae3d7149c98e3c4d72dbd348094958cdebbc7 (patch)
tree3b371cd749ea9e2f0b5d9f6da9443aab5e0ac132 /src/Plugins
parentbec143183692b260bd02fc982952b31c672f2f29 (diff)
downloadxmobar-499ae3d7149c98e3c4d72dbd348094958cdebbc7.tar.gz
xmobar-499ae3d7149c98e3c4d72dbd348094958cdebbc7.tar.bz2
Battery: unnecessary external calls to /usr/bin/cat removed
Diffstat (limited to 'src/Plugins')
-rw-r--r--src/Plugins/Monitors/Batt.hs4
-rw-r--r--src/Plugins/Monitors/Common.hs5
2 files changed, 2 insertions, 7 deletions
diff --git a/src/Plugins/Monitors/Batt.hs b/src/Plugins/Monitors/Batt.hs
index 0bb64d5..c9ea220 100644
--- a/src/Plugins/Monitors/Batt.hs
+++ b/src/Plugins/Monitors/Batt.hs
@@ -107,7 +107,7 @@ haveAc :: FilePath -> IO Bool
haveAc f = do
exists <- fileExist ofile
if exists
- then fmap ((== "1\n") . B.unpack) (catRead ofile)
+ then fmap ((== "1\n") . B.unpack) (B.readFile ofile)
else return False
where ofile = sysDir </> f
@@ -122,7 +122,7 @@ readBattery files =
(3600 * b / 1000000) -- wattseconds
(c / 1000000) -- volts
(d / c) -- amperes
- where grab = fmap (read . B.unpack) . catRead
+ where grab = fmap (read . B.unpack) . B.readFile
readBatteries :: BattOpts -> [Files] -> IO Result
readBatteries opts bfs =
diff --git a/src/Plugins/Monitors/Common.hs b/src/Plugins/Monitors/Common.hs
index cc1a6a7..27ab41c 100644
--- a/src/Plugins/Monitors/Common.hs
+++ b/src/Plugins/Monitors/Common.hs
@@ -53,7 +53,6 @@ module Plugins.Monitors.Common (
-- * Threaded Actions
-- $thread
, doActionTwiceWithDelay
- , catRead
) where
@@ -67,7 +66,6 @@ import Numeric
import Text.ParserCombinators.Parsec
import System.Console.GetOpt
import Control.Exception (SomeException,handle)
-import System.Process (readProcess)
import Plugins
-- $monitor
@@ -441,6 +439,3 @@ getData action var d =
do threadDelay d
s <- action
modifyMVar_ var (\_ -> return $! s)
-
-catRead :: FilePath -> IO B.ByteString
-catRead file = B.pack `fmap` readProcess "/bin/cat" [file] ""