From 95a94efccd1414235d16708be20c9e10f8f7db82 Mon Sep 17 00:00:00 2001
From: Felix Springer <felixspringer149@gmail.com>
Date: Fri, 12 Jul 2019 01:29:28 +0200
Subject: moved CoreTemp to MultiCoreTemp
---
src/Xmobar/Plugins/Monitors.hs | 4 +
src/Xmobar/Plugins/Monitors/CoreTemp.hs | 158 ---------------------------
src/Xmobar/Plugins/Monitors/MultiCoreTemp.hs | 158 +++++++++++++++++++++++++++
3 files changed, 162 insertions(+), 158 deletions(-)
delete mode 100644 src/Xmobar/Plugins/Monitors/CoreTemp.hs
create mode 100644 src/Xmobar/Plugins/Monitors/MultiCoreTemp.hs
diff --git a/src/Xmobar/Plugins/Monitors.hs b/src/Xmobar/Plugins/Monitors.hs
index 63bd0eb..d40f84d 100644
--- a/src/Xmobar/Plugins/Monitors.hs
+++ b/src/Xmobar/Plugins/Monitors.hs
@@ -34,6 +34,7 @@ import Xmobar.Plugins.Monitors.Thermal
import Xmobar.Plugins.Monitors.ThermalZone
import Xmobar.Plugins.Monitors.CpuFreq
import Xmobar.Plugins.Monitors.CoreTemp
+import Xmobar.Plugins.Monitors.MultiCoreTemp
import Xmobar.Plugins.Monitors.Disk
import Xmobar.Plugins.Monitors.Top
import Xmobar.Plugins.Monitors.Uptime
@@ -72,6 +73,7 @@ data Monitors = Network Interface Args Rate
| Brightness Args Rate
| CpuFreq Args Rate
| CoreTemp Args Rate
+ | MultiCoreTemp Args Rate
| TopProc Args Rate
| TopMem Args Rate
| Uptime Args Rate
@@ -132,6 +134,7 @@ instance Exec Monitors where
alias (TopProc _ _) = "top"
alias (TopMem _ _) = "topmem"
alias (CoreTemp _ _) = "coretemp"
+ alias (MultiCoreTemp _ _) = "multicoretemp"
alias DiskU {} = "disku"
alias DiskIO {} = "diskio"
alias (Uptime _ _) = "uptime"
@@ -175,6 +178,7 @@ instance Exec Monitors where
start (Brightness a r) = runM a brightConfig runBright r
start (CpuFreq a r) = runM a cpuFreqConfig runCpuFreq r
start (CoreTemp a r) = startCoreTemp a r
+ start (MultiCoreTemp a r) = startMultiCoreTemp a r
start (DiskU s a r) = runM a diskUConfig (runDiskU s) r
start (DiskIO s a r) = startDiskIO s a r
start (Uptime a r) = runM a uptimeConfig runUptime r
diff --git a/src/Xmobar/Plugins/Monitors/CoreTemp.hs b/src/Xmobar/Plugins/Monitors/CoreTemp.hs
deleted file mode 100644
index 7a6bdfd..0000000
--- a/src/Xmobar/Plugins/Monitors/CoreTemp.hs
+++ /dev/null
@@ -1,158 +0,0 @@
------------------------------------------------------------------------------
--- |
--- Module : Plugins.Monitors.CoreTemp
--- Copyright : (c) 2019 Felix Springer
--- License : BSD-style (see LICENSE)
---
--- Maintainer : Felix Springer <felixspringer149@gmail.com>
--- Stability : unstable
--- Portability : unportable
---
--- A core temperature monitor for Xmobar
---
------------------------------------------------------------------------------
-
-module Xmobar.Plugins.Monitors.CoreTemp (startCoreTemp) where
-
-import Xmobar.Plugins.Monitors.Common
-import Control.Monad (filterM)
-import System.Console.GetOpt
-import System.Directory ( doesDirectoryExist
- , doesFileExist
- )
-
--- | Declare Options.
-data CTOpts = CTOpts { loadIconPattern :: Maybe IconPattern
- , mintemp :: Float
- , maxtemp :: Float
- }
-
--- | Set default Options.
-defaultOpts :: CTOpts
-defaultOpts = CTOpts { loadIconPattern = Nothing
- , mintemp = 0
- , maxtemp = 100
- }
-
--- | Apply configured Options.
-options :: [OptDescr (CTOpts -> CTOpts)]
-options = [ Option [] ["load-icon-pattern"]
- (ReqArg
- (\ arg opts -> opts { loadIconPattern = Just $ parseIconPattern arg })
- "")
- ""
- , Option [] ["mintemp"]
- (ReqArg
- (\ arg opts -> opts { mintemp = read arg })
- "")
- ""
- , Option [] ["maxtemp"]
- (ReqArg
- (\ arg opts -> opts { maxtemp = read arg })
- "")
- ""
- ]
-
--- | Parse Arguments and apply them to Options.
-parseOpts :: [String] -> IO CTOpts
-parseOpts argv = case getOpt Permute options argv of
- (opts , _ , [] ) -> return $ foldr id defaultOpts opts
- (_ , _ , errs) -> ioError . userError $ concat errs
-
--- | Generate Config with a default template and options.
-cTConfig :: IO MConfig
-cTConfig = mkMConfig cTTemplate cTOptions
- where cTTemplate = "Temp: <max>°C - <maxpc>%"
- cTOptions = [ "max" , "maxpc" , "maxbar" , "maxvbar" , "maxipat"
- , "avg" , "avgpc" , "avgbar" , "avgvbar" , "avgipat"
- ] ++ map (("core" ++) . show) [0 :: Int ..]
-
--- | Returns the first coretemp.N path found.
-coretempPath :: IO String
-coretempPath = do xs <- filterM doesDirectoryExist ps
- let x = head xs
- return x
- where ps = [ "/sys/bus/platform/devices/coretemp." ++ show (x :: Int) ++ "/" | x <- [0..9] ]
-
--- | Returns the first hwmonN path found.
-hwmonPath :: IO String
-hwmonPath = do p <- coretempPath
- xs <- filterM doesDirectoryExist [ p ++ "hwmon/hwmon" ++ show (x :: Int) ++ "/" | x <- [0..9] ]
- let x = head xs
- return x
-
--- | Checks Labels, if they refer to a core and returns Strings of core-
--- temperatures.
-corePaths :: IO [String]
-corePaths = do p <- hwmonPath
- ls <- filterM doesFileExist [ p ++ "temp" ++ show (x :: Int) ++ "_label" | x <- [0..9] ]
- cls <- filterM isLabelFromCore ls
- return $ map labelToCore cls
-
--- | Checks if Label refers to a core.
-isLabelFromCore :: FilePath -> IO Bool
-isLabelFromCore p = do a <- readFile p
- return $ take 4 a == "Core"
-
--- | Transform a path to Label to a path to core-temperature.
-labelToCore :: FilePath -> FilePath
-labelToCore = (++ "input") . reverse . drop 5 . reverse
-
--- | Reads core-temperatures as data from the system.
-cTData :: IO [Float]
-cTData = do fps <- corePaths
- traverse readSingleFile fps
- where readSingleFile :: FilePath -> IO Float
- readSingleFile s = do a <- readFile s
- return $ parseContent a
- where parseContent :: String -> Float
- parseContent = read . head . lines
-
--- | Transforms data of temperatures into temperatures of degree Celsius.
-parseCT :: IO [Float]
-parseCT = do rawCTs <- cTData
- let normalizedCTs = map (/ 1000) rawCTs :: [Float]
- return normalizedCTs
-
--- | Performs calculation for maximum and average.
--- Sets up Bars and Values to be printed.
-formatCT :: CTOpts -> [Float] -> Monitor [String]
-formatCT opts cTs = do let CTOpts { mintemp = minT
- , maxtemp = maxT } = opts
- domainT = maxT - minT
- maxCT = maximum cTs
- avgCT = sum cTs / fromIntegral (length cTs)
- calcPc t = (t - minT) / domainT
- maxCTPc = calcPc maxCT
- avgCTPc = calcPc avgCT
-
- cs <- traverse showTempWithColors cTs
-
- m <- showTempWithColors maxCT
- mp <- showWithColors' (show (round (100*maxCTPc) :: Int)) maxCT
- mb <- showPercentBar maxCT maxCTPc
- mv <- showVerticalBar maxCT maxCTPc
- mi <- showIconPattern (loadIconPattern opts) maxCTPc
-
- a <- showTempWithColors avgCT
- ap <- showWithColors' (show (round (100*avgCTPc) :: Int)) avgCT
- ab <- showPercentBar avgCT avgCTPc
- av <- showVerticalBar avgCT avgCTPc
- ai <- showIconPattern (loadIconPattern opts) avgCTPc
-
- let ms = [ m , mp , mb , mv , mi ]
- as = [ a , ap , ab , av , ai ]
-
- return (ms ++ as ++ cs)
- where showTempWithColors :: Float -> Monitor String
- showTempWithColors = showWithColors (show . (round :: Float -> Int))
-
-
-runCT :: [String] -> Monitor String
-runCT argv = do cTs <- io parseCT
- opts <- io $ parseOpts argv
- l <- formatCT opts cTs
- parseTemplate l
-
-startCoreTemp :: [String] -> Int -> (String -> IO ()) -> IO ()
-startCoreTemp a = runM a cTConfig runCT
diff --git a/src/Xmobar/Plugins/Monitors/MultiCoreTemp.hs b/src/Xmobar/Plugins/Monitors/MultiCoreTemp.hs
new file mode 100644
index 0000000..b0325dc
--- /dev/null
+++ b/src/Xmobar/Plugins/Monitors/MultiCoreTemp.hs
@@ -0,0 +1,158 @@
+-----------------------------------------------------------------------------
+-- |
+-- Module : Plugins.Monitors.MultiCoreTemp
+-- Copyright : (c) 2019 Felix Springer
+-- License : BSD-style (see LICENSE)
+--
+-- Maintainer : Felix Springer <felixspringer149@gmail.com>
+-- Stability : unstable
+-- Portability : unportable
+--
+-- A core temperature monitor for Xmobar
+--
+-----------------------------------------------------------------------------
+
+module Xmobar.Plugins.Monitors.MultiCoreTemp (startMultiCoreTemp) where
+
+import Xmobar.Plugins.Monitors.Common
+import Control.Monad (filterM)
+import System.Console.GetOpt
+import System.Directory ( doesDirectoryExist
+ , doesFileExist
+ )
+
+-- | Declare Options.
+data CTOpts = CTOpts { loadIconPattern :: Maybe IconPattern
+ , mintemp :: Float
+ , maxtemp :: Float
+ }
+
+-- | Set default Options.
+defaultOpts :: CTOpts
+defaultOpts = CTOpts { loadIconPattern = Nothing
+ , mintemp = 0
+ , maxtemp = 100
+ }
+
+-- | Apply configured Options.
+options :: [OptDescr (CTOpts -> CTOpts)]
+options = [ Option [] ["load-icon-pattern"]
+ (ReqArg
+ (\ arg opts -> opts { loadIconPattern = Just $ parseIconPattern arg })
+ "")
+ ""
+ , Option [] ["mintemp"]
+ (ReqArg
+ (\ arg opts -> opts { mintemp = read arg })
+ "")
+ ""
+ , Option [] ["maxtemp"]
+ (ReqArg
+ (\ arg opts -> opts { maxtemp = read arg })
+ "")
+ ""
+ ]
+
+-- | Parse Arguments and apply them to Options.
+parseOpts :: [String] -> IO CTOpts
+parseOpts argv = case getOpt Permute options argv of
+ (opts , _ , [] ) -> return $ foldr id defaultOpts opts
+ (_ , _ , errs) -> ioError . userError $ concat errs
+
+-- | Generate Config with a default template and options.
+cTConfig :: IO MConfig
+cTConfig = mkMConfig cTTemplate cTOptions
+ where cTTemplate = "Temp: <max>°C - <maxpc>%"
+ cTOptions = [ "max" , "maxpc" , "maxbar" , "maxvbar" , "maxipat"
+ , "avg" , "avgpc" , "avgbar" , "avgvbar" , "avgipat"
+ ] ++ map (("core" ++) . show) [0 :: Int ..]
+
+-- | Returns the first coretemp.N path found.
+coretempPath :: IO String
+coretempPath = do xs <- filterM doesDirectoryExist ps
+ let x = head xs
+ return x
+ where ps = [ "/sys/bus/platform/devices/coretemp." ++ show (x :: Int) ++ "/" | x <- [0..9] ]
+
+-- | Returns the first hwmonN path found.
+hwmonPath :: IO String
+hwmonPath = do p <- coretempPath
+ xs <- filterM doesDirectoryExist [ p ++ "hwmon/hwmon" ++ show (x :: Int) ++ "/" | x <- [0..9] ]
+ let x = head xs
+ return x
+
+-- | Checks Labels, if they refer to a core and returns Strings of core-
+-- temperatures.
+corePaths :: IO [String]
+corePaths = do p <- hwmonPath
+ ls <- filterM doesFileExist [ p ++ "temp" ++ show (x :: Int) ++ "_label" | x <- [0..9] ]
+ cls <- filterM isLabelFromCore ls
+ return $ map labelToCore cls
+
+-- | Checks if Label refers to a core.
+isLabelFromCore :: FilePath -> IO Bool
+isLabelFromCore p = do a <- readFile p
+ return $ take 4 a == "Core"
+
+-- | Transform a path to Label to a path to core-temperature.
+labelToCore :: FilePath -> FilePath
+labelToCore = (++ "input") . reverse . drop 5 . reverse
+
+-- | Reads core-temperatures as data from the system.
+cTData :: IO [Float]
+cTData = do fps <- corePaths
+ traverse readSingleFile fps
+ where readSingleFile :: FilePath -> IO Float
+ readSingleFile s = do a <- readFile s
+ return $ parseContent a
+ where parseContent :: String -> Float
+ parseContent = read . head . lines
+
+-- | Transforms data of temperatures into temperatures of degree Celsius.
+parseCT :: IO [Float]
+parseCT = do rawCTs <- cTData
+ let normalizedCTs = map (/ 1000) rawCTs :: [Float]
+ return normalizedCTs
+
+-- | Performs calculation for maximum and average.
+-- Sets up Bars and Values to be printed.
+formatCT :: CTOpts -> [Float] -> Monitor [String]
+formatCT opts cTs = do let CTOpts { mintemp = minT
+ , maxtemp = maxT } = opts
+ domainT = maxT - minT
+ maxCT = maximum cTs
+ avgCT = sum cTs / fromIntegral (length cTs)
+ calcPc t = (t - minT) / domainT
+ maxCTPc = calcPc maxCT
+ avgCTPc = calcPc avgCT
+
+ cs <- traverse showTempWithColors cTs
+
+ m <- showTempWithColors maxCT
+ mp <- showWithColors' (show (round (100*maxCTPc) :: Int)) maxCT
+ mb <- showPercentBar maxCT maxCTPc
+ mv <- showVerticalBar maxCT maxCTPc
+ mi <- showIconPattern (loadIconPattern opts) maxCTPc
+
+ a <- showTempWithColors avgCT
+ ap <- showWithColors' (show (round (100*avgCTPc) :: Int)) avgCT
+ ab <- showPercentBar avgCT avgCTPc
+ av <- showVerticalBar avgCT avgCTPc
+ ai <- showIconPattern (loadIconPattern opts) avgCTPc
+
+ let ms = [ m , mp , mb , mv , mi ]
+ as = [ a , ap , ab , av , ai ]
+
+ return (ms ++ as ++ cs)
+ where showTempWithColors :: Float -> Monitor String
+ showTempWithColors = showWithColors (show . (round :: Float -> Int))
+
+
+runCT :: [String] -> Monitor String
+runCT argv = do cTs <- io parseCT
+ opts <- io $ parseOpts argv
+ l <- formatCT opts cTs
+ parseTemplate l
+
+startMultiCoreTemp :: [String] -> Int -> (String -> IO ()) -> IO ()
+startMultiCoreTemp a = runM a cTConfig runCT
--
cgit v1.2.3