diff options
| author | jao <jao@gnu.org> | 2024-08-25 17:47:30 +0100 |
|---|---|---|
| committer | jao <jao@gnu.org> | 2024-08-25 17:47:30 +0100 |
| commit | 0c4daf1bcb9373479ac99767ee0dcb649e248f25 (patch) | |
| tree | 50765c78b34c7375270a28934a23a0d108fe680a /src | |
| parent | 42630b2973cd624fceb33ae442dea4bf565ee5b1 (diff) | |
| download | xmobar-0c4daf1bcb9373479ac99767ee0dcb649e248f25.tar.gz xmobar-0c4daf1bcb9373479ac99767ee0dcb649e248f25.tar.bz2 | |
new template variable weatherS for WeatherX
Diffstat (limited to 'src')
| -rw-r--r-- | src/Xmobar/Plugins/Monitors/Weather.hs | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/Xmobar/Plugins/Monitors/Weather.hs b/src/Xmobar/Plugins/Monitors/Weather.hs index e71de10..a46bb4f 100644 --- a/src/Xmobar/Plugins/Monitors/Weather.hs +++ b/src/Xmobar/Plugins/Monitors/Weather.hs @@ -66,6 +66,7 @@ weatherConfig = mkMConfig , "skyCondition" , "skyConditionS" , "weather" + , "weatherS" , "tempC" , "tempF" , "dewPointC" @@ -221,22 +222,24 @@ getData station = CE.catch errHandler :: CE.SomeException -> IO String errHandler _ = return "<Could not retrieve data>" -formatSk :: Eq p => [(p, p)] -> p -> p -formatSk ((a,b):sks) sk = if a == sk then b else formatSk sks sk -formatSk [] sk = sk +formatSk :: Eq p => [(p, p)] -> p -> p -> p +formatSk ((a,b):sks) sk d = if a == sk then b else formatSk sks sk d +formatSk [] _ d = d formatWeather :: WeatherOpts -- ^ Formatting options from the cfg file -> [(String,String)] -- ^ 'SkyConditionS' for 'WeatherX' -> [WeatherInfo] -- ^ The actual weather info -> Monitor String -formatWeather opts sks [WI st ss y m d h (WindInfo wc wa wm wk wkh wms) v sk we tC tF dC dF r p] = +formatWeather opts sks + [WI st ss y m d h (WindInfo wc wa wm wk wkh wms) v sk we tC tF dC dF r p] = do cel <- showWithColors show tC far <- showWithColors show tF - let sk' = formatSk sks (map toLower sk) + let sk' = formatSk sks (map toLower sk) "" we' = showWeather (weatherString opts) we + we'' = formatSk sks (map toLower we') sk' parseTemplate [st, ss, y, m, d, h, wc, wa, wm, wk, wkh - , wms, v, sk, sk', we', cel, far + , wms, v, sk, sk', we', we'', cel, far , show dC, show dF, show r , show p ] formatWeather _ _ _ = getConfigValue naString |