From 4de0e15f9e7f1022afa8b74479ec66b867d50398 Mon Sep 17 00:00:00 2001 From: jao Date: Sat, 13 Feb 2021 01:54:43 +0000 Subject: Accepting explicit location for wttr.in --- src/TopC.hs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/TopC.hs b/src/TopC.hs index 46d45bc..894fd98 100644 --- a/src/TopC.hs +++ b/src/TopC.hs @@ -45,8 +45,9 @@ music = concatMonitor " " (fni "\xf1bc")) -- "https://wttr.in?format=" ++ fnn 3 "%c" ++ "+%t+%C+%w++" ++ fnn 1 "%m" -wttrURL = "https://wttr.in?format=" ++ fnn 2 "+%c+" ++ "+%t+%C+" ++ fn 5 "%w" - where fnn n x = urlEncode ("") ++ x ++ urlEncode "" +wttrURL l = "https://wttr.in/" ++ l ++ "?format=" ++ fmt + where fmt = fnn 2 "+%c+" ++ "+%t+%C+" ++ fn 5 "%w" + fnn n x = urlEncode ("") ++ x ++ urlEncode "" encode c | c == ' ' = "+" | Char.isAlphaNum c || c `elem` "-._~" = [c] @@ -80,7 +81,7 @@ config p = (baseConfig p) { , Run laTime , Run localTime -- , Run w -- LEGE, LEBL, KCV0 - , Run (ComX "curl" [wttrURL] "" "wttr" 18000) + , Run (ComX "curl" [wttrURL "Edinburgh"] "" "wttr" 18000) ] , template = " " ++ "|batt0| " -- cgit v1.2.3