From 4000813b92d719ae68c15bb565a5ef4d985aaae2 Mon Sep 17 00:00:00 2001
From: Jens Nolte <jens@nightmarestudio.de>
Date: Thu, 27 Feb 2020 02:32:39 +0100
Subject: [PATCH] Use forever
---
app/Main.hs | 2 +-
src/QBar/Blocks/Battery.hs | 3 +--
src/QBar/Blocks/Date.hs | 5 ++---
3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/app/Main.hs b/app/Main.hs
index 1aa42b0..8a4c11d 100644
--- a/app/Main.hs
+++ b/app/Main.hs
@@ -3,4 +3,4 @@ module Main where
import QBar.Cli
main :: IO ()
-main = runQBar
\ No newline at end of file
+main = runQBar
diff --git a/src/QBar/Blocks/Battery.hs b/src/QBar/Blocks/Battery.hs
index f7d0358..cddb65a 100644
--- a/src/QBar/Blocks/Battery.hs
+++ b/src/QBar/Blocks/Battery.hs
@@ -52,12 +52,11 @@ getBatteryState path = tryMaybe $ do
batteryBlock :: PullBlock
-batteryBlock = do
+batteryBlock = forever $ do
batteryPaths <- liftIO $ map ((apiPath <> "/") <>) . filter (T.isPrefixOf "BAT" . T.pack) <$> getDirectoryContents apiPath
batteryStates <- liftIO $ mapM getBatteryState batteryPaths
isPlugged <- liftIO getPluggedState
updateBatteryBlock isPlugged $ catMaybes batteryStates
- batteryBlock
where
apiPath :: FilePath
apiPath = "/sys/class/power_supply"
diff --git a/src/QBar/Blocks/Date.hs b/src/QBar/Blocks/Date.hs
index a8658d1..d640647 100644
--- a/src/QBar/Blocks/Date.hs
+++ b/src/QBar/Blocks/Date.hs
@@ -11,10 +11,9 @@ import Control.Lens
dateBlock :: PushBlock
-dateBlock = do
+dateBlock = forever $ do
updateBlock =<< liftIO dateBlockOutput
- liftIO $ sleepUntil =<< nextMinute
- dateBlock
+ sleepUntilInterval everyMinute
dateBlockOutput :: IO BlockOutput
--
GitLab