summaryrefslogtreecommitdiffhomepage
path: root/src/Xmobar/Plugins
diff options
context:
space:
mode:
authorjao <jao@gnu.org>2018-12-03 03:47:05 +0000
committerjao <jao@gnu.org>2018-12-03 03:47:05 +0000
commitcf874686b755ebc3784c7123752473f7c12c0580 (patch)
treed2509e554ba42a777c6d606f57d7fd6a1a5fe7dc /src/Xmobar/Plugins
parent503b4b1c77063251378245f7116a5b6caca463fe (diff)
downloadxmobar-cf874686b755ebc3784c7123752473f7c12c0580.tar.gz
xmobar-cf874686b755ebc3784c7123752473f7c12c0580.tar.bz2
CoreCommon -> Common.Files
Diffstat (limited to 'src/Xmobar/Plugins')
-rw-r--r--src/Xmobar/Plugins/Monitors/CatInt.hs1
-rw-r--r--src/Xmobar/Plugins/Monitors/Common.hs2
-rw-r--r--src/Xmobar/Plugins/Monitors/Common/Files.hs (renamed from src/Xmobar/Plugins/Monitors/CoreCommon.hs)11
-rw-r--r--src/Xmobar/Plugins/Monitors/CoreTemp.hs2
-rw-r--r--src/Xmobar/Plugins/Monitors/CpuFreq.hs1
5 files changed, 9 insertions, 8 deletions
diff --git a/src/Xmobar/Plugins/Monitors/CatInt.hs b/src/Xmobar/Plugins/Monitors/CatInt.hs
index 781eded..0c4e391 100644
--- a/src/Xmobar/Plugins/Monitors/CatInt.hs
+++ b/src/Xmobar/Plugins/Monitors/CatInt.hs
@@ -13,7 +13,6 @@
module Xmobar.Plugins.Monitors.CatInt where
import Xmobar.Plugins.Monitors.Common
-import Xmobar.Plugins.Monitors.CoreCommon
catIntConfig :: IO MConfig
catIntConfig = mkMConfig "<v>" ["v"]
diff --git a/src/Xmobar/Plugins/Monitors/Common.hs b/src/Xmobar/Plugins/Monitors/Common.hs
index 10c3c9f..02eb7ae 100644
--- a/src/Xmobar/Plugins/Monitors/Common.hs
+++ b/src/Xmobar/Plugins/Monitors/Common.hs
@@ -18,9 +18,11 @@ module Xmobar.Plugins.Monitors.Common
, module Xmobar.Plugins.Monitors.Common.Run
, module Xmobar.Plugins.Monitors.Common.Output
, module Xmobar.Plugins.Monitors.Common.Parsers
+ , module Xmobar.Plugins.Monitors.Common.Files
) where
import Xmobar.Plugins.Monitors.Common.Types
import Xmobar.Plugins.Monitors.Common.Run
import Xmobar.Plugins.Monitors.Common.Output
import Xmobar.Plugins.Monitors.Common.Parsers
+import Xmobar.Plugins.Monitors.Common.Files
diff --git a/src/Xmobar/Plugins/Monitors/CoreCommon.hs b/src/Xmobar/Plugins/Monitors/Common/Files.hs
index a84198e..b08fe6c 100644
--- a/src/Xmobar/Plugins/Monitors/CoreCommon.hs
+++ b/src/Xmobar/Plugins/Monitors/Common/Files.hs
@@ -2,7 +2,7 @@
-----------------------------------------------------------------------------
-- |
--- Module : Plugins.Monitors.CoreCommon
+-- Module : Plugins.Monitors.Files
-- Copyright : (c) Juraj Hercek
-- License : BSD-style (see LICENSE)
--
@@ -10,11 +10,11 @@
-- Stability : unstable
-- Portability : unportable
--
--- The common part for cpu core monitors (e.g. cpufreq, coretemp)
+-- Specialized helpers to access files and their contents
--
-----------------------------------------------------------------------------
-module Xmobar.Plugins.Monitors.CoreCommon where
+module Xmobar.Plugins.Monitors.Common.Files (checkedDataRetrieval) where
#if __GLASGOW_HASKELL__ < 800
import Control.Applicative
@@ -24,9 +24,12 @@ import Data.Char hiding (Space)
import Data.Function
import Data.List
import Data.Maybe
-import Xmobar.Plugins.Monitors.Common
import System.Directory
+import Xmobar.Plugins.Monitors.Common.Types
+import Xmobar.Plugins.Monitors.Common.Parsers
+import Xmobar.Plugins.Monitors.Common.Output
+
checkedDataRetrieval :: (Ord a, Num a)
=> String -> [[String]] -> Maybe (String, String -> Int)
-> (Double -> a) -> (a -> String) -> Monitor String
diff --git a/src/Xmobar/Plugins/Monitors/CoreTemp.hs b/src/Xmobar/Plugins/Monitors/CoreTemp.hs
index 48fe428..3e462ce 100644
--- a/src/Xmobar/Plugins/Monitors/CoreTemp.hs
+++ b/src/Xmobar/Plugins/Monitors/CoreTemp.hs
@@ -15,8 +15,6 @@
module Xmobar.Plugins.Monitors.CoreTemp where
import Xmobar.Plugins.Monitors.Common
-import Xmobar.Plugins.Monitors.CoreCommon
-
import Data.Char (isDigit)
diff --git a/src/Xmobar/Plugins/Monitors/CpuFreq.hs b/src/Xmobar/Plugins/Monitors/CpuFreq.hs
index 1afedfa..9274cd7 100644
--- a/src/Xmobar/Plugins/Monitors/CpuFreq.hs
+++ b/src/Xmobar/Plugins/Monitors/CpuFreq.hs
@@ -15,7 +15,6 @@
module Xmobar.Plugins.Monitors.CpuFreq where
import Xmobar.Plugins.Monitors.Common
-import Xmobar.Plugins.Monitors.CoreCommon
-- |
-- Cpu frequency default configuration. Default template contains only