diff options
| -rw-r--r-- | bench/main.hs | 22 | ||||
| -rw-r--r-- | changelog.md | 4 | ||||
| -rw-r--r-- | readme.md | 1 | ||||
| -rw-r--r-- | src/Xmobar/Plugins/Date.hs | 21 | ||||
| -rw-r--r-- | xmobar.cabal | 2 |
5 files changed, 42 insertions, 8 deletions
diff --git a/bench/main.hs b/bench/main.hs index f8db78c..10639eb 100644 --- a/bench/main.hs +++ b/bench/main.hs @@ -1,12 +1,14 @@ module Main (main) where +import Data.IORef (newIORef) +import Data.Time import Gauge import Xmobar import Xmobar.Plugins.Monitors.Cpu main :: IO () main = do - defaultMain =<< sequence [cpuBench] + defaultMain =<< sequence [cpuBench, dateBench] mkCpuArgs :: IO CpuArguments mkCpuArgs = getArguments ["-L", "3", "-H", "50", "--normal", "green", "--high", "red", "-t", "Cpu: <total>%"] @@ -17,3 +19,21 @@ cpuBench = do return $ bgroup "Cpu Benchmarks" [ bench "CPU normal args" $ nfIO (runCpu cpuArgs) ] + +dateBench :: IO Benchmark +dateBench = do + let format = "D: %B %d %A W%V" + zone <- getCurrentTimeZone + zone' <- newIORef =<< getCurrentTimeZone + return $ bgroup "Date Benchmarks" + [ bench "Date" $ nfIO (date zone' format) + , bench "DateZonedTime" $ nfIO (dateZonedTime format) + , bench "DateWithTimeZone" $ nfIO (dateWithTimeZone zone format) + ] + +dateZonedTime :: String -> IO String +dateZonedTime format = fmap (formatTime defaultTimeLocale format) getZonedTime + +dateWithTimeZone :: TimeZone -> String -> IO String +dateWithTimeZone zone format = + fmap (formatTime defaultTimeLocale format . utcToZonedTime zone) getCurrentTime diff --git a/changelog.md b/changelog.md index 859d475..28ae950 100644 --- a/changelog.md +++ b/changelog.md @@ -6,8 +6,8 @@ _New features_ _Bug fixes_ - - Fix date plugin not picking up DST and timezone changes - (Fixed by reverting the optimization merged in 0.34). + - Fix date plugin not picking up DST and timezone changes (refresh + timezone once a minute to preserve the optimized performace of 0.34). ## Version 0.36 (August, 2020) @@ -1540,6 +1540,7 @@ will display "N/A" if for some reason the `date` invocation fails. - Format is a time format string, as accepted by the standard ISO C `strftime` function (or Haskell's `formatCalendarTime`). +- Timezone changes are picked up automatically every minute. - Sample usage: `Run Date "%a %b %_d %Y <fc=#ee9a00>%H:%M:%S</fc>" "date" 10` ## `DateZone Format Locale Zone Alias RefreshRate` diff --git a/src/Xmobar/Plugins/Date.hs b/src/Xmobar/Plugins/Date.hs index 1cb0596..d7de2e9 100644 --- a/src/Xmobar/Plugins/Date.hs +++ b/src/Xmobar/Plugins/Date.hs @@ -17,22 +17,35 @@ -- ----------------------------------------------------------------------------- -module Xmobar.Plugins.Date (Date(..)) where +module Xmobar.Plugins.Date (Date(..), date) where import Xmobar.Run.Exec #if ! MIN_VERSION_time(1,5,0) import System.Locale #endif +import Data.IORef import Data.Time +import Control.Concurrent.Async (concurrently_) data Date = Date String String Int deriving (Read, Show) instance Exec Date where alias (Date _ a _) = a - run (Date f _ _) = date f rate (Date _ _ r) = r + start (Date f _ r) cb = + -- refresh time zone once a minute to avoid wasting CPU cycles + withRefreshingZone 600 $ \zone -> + doEveryTenthSeconds r $ date zone f >>= cb -date :: String -> IO String -date format = fmap (formatTime defaultTimeLocale format) getZonedTime +date :: IORef TimeZone -> String -> IO String +date zoneRef format = do + zone <- readIORef zoneRef + fmap (formatTime defaultTimeLocale format . utcToZonedTime zone) getCurrentTime + +withRefreshingZone :: Int -> (IORef TimeZone -> IO ()) -> IO () +withRefreshingZone r action = do + zone <- newIORef =<< getCurrentTimeZone + let refresh = atomicWriteIORef zone =<< getCurrentTimeZone + concurrently_ (doEveryTenthSeconds r refresh) (action zone) diff --git a/xmobar.cabal b/xmobar.cabal index 57dfcb9..c03db46 100644 --- a/xmobar.cabal +++ b/xmobar.cabal @@ -357,5 +357,5 @@ benchmark xmobarbench hs-source-dirs: bench ghc-options: -funbox-strict-fields -Wall -fno-warn-unused-do-bind -O2 - build-depends: base, gauge, xmobar, mtl + build-depends: base, gauge, xmobar, mtl, time default-language: Haskell2010 |