diff options
author | slotThe <soliditsallgood@tuta.io> | 2020-01-04 21:20:56 +0100 |
---|---|---|
committer | jao <jao@gnu.org> | 2020-01-04 21:21:40 +0000 |
commit | 940be3bb32ed1f11c46ede98d51516998b17e128 (patch) | |
tree | 6d0c942c10efc64514dd419f746f631aec19c935 /src/Xmobar/Plugins/Monitors/Net.hs | |
parent | 2ec513d2e193998958ad5bf4a5f7280f595792e9 (diff) | |
download | xmobar-940be3bb32ed1f11c46ede98d51516998b17e128.tar.gz xmobar-940be3bb32ed1f11c46ede98d51516998b17e128.tar.bz2 |
Replace parseOpts with a generic function
Diffstat (limited to 'src/Xmobar/Plugins/Monitors/Net.hs')
-rw-r--r-- | src/Xmobar/Plugins/Monitors/Net.hs | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/Xmobar/Plugins/Monitors/Net.hs b/src/Xmobar/Plugins/Monitors/Net.hs index 6acec62..db11724 100644 --- a/src/Xmobar/Plugins/Monitors/Net.hs +++ b/src/Xmobar/Plugins/Monitors/Net.hs @@ -68,12 +68,6 @@ options = o { onlyDevList = Just $ parseDevList x }) "") "" ] -parseOpts :: [String] -> IO NetOpts -parseOpts argv = - case getOpt Permute options argv of - (o, _, []) -> return $ foldr id defaultOpts o - (_, _, errs) -> ioError . userError $ concat errs - data UnitPerSec = Bs | KBs | MBs | GBs deriving (Eq,Enum,Ord) data NetValue = NetValue Float UnitPerSec deriving (Eq,Show) @@ -188,7 +182,7 @@ parseNet nref nd = do runNet :: NetDevRef -> String -> [String] -> Monitor String runNet nref i argv = do dev <- io $ parseNet nref i - opts <- io $ parseOpts argv + opts <- io $ parseOptsWith options defaultOpts argv printNet opts dev parseNets :: [(NetDevRef, String)] -> IO [NetDevRate] @@ -196,7 +190,7 @@ parseNets = mapM $ uncurry parseNet runNets :: [(NetDevRef, String)] -> [String] -> Monitor String runNets refs argv = do - opts <- io $ parseOpts argv + opts <- io $ parseOptsWith options defaultOpts argv dev <- io $ parseActive $ filterRefs opts refs printNet opts dev where parseActive refs' = fmap selectActive (parseNets refs') |