X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/ef872db5dc8680bb88992867e74128b8562a6d33..321274e33237aefa896eabcf6fb0b2c439cd2bdb:/widgets/weather.lua?ds=sidebyside diff --git a/widgets/weather.lua b/widgets/weather.lua index 37a92ff..3512f22 100644 --- a/widgets/weather.lua +++ b/widgets/weather.lua @@ -38,7 +38,7 @@ local function worker(args) local current_call = args.current_call or "curl -s 'http://api.openweathermap.org/data/2.5/weather?id=%s&units=%s&lang=%s&APPID=%s'" local forecast_call = args.forecast_call or "curl -s 'http://api.openweathermap.org/data/2.5/forecast/daily?id=%s&units=%s&lang=%s&cnt=%s&APPID=%s'" local city_id = args.city_id or 0 -- placeholder - local utc = args.utc or 0 + local utc = args.utc or 0 local units = args.units or "metric" local lang = args.lang or "en" local cnt = args.cnt or 5 @@ -126,11 +126,13 @@ local function worker(args) if not err and weather_now and tonumber(weather_now["cod"]) == 200 then -- weather icon based on localtime - now = os.time() - (utc * 3600) + now = os.time() sunrise = tonumber(weather_now["sys"]["sunrise"]) sunset = tonumber(weather_now["sys"]["sunset"]) icon = weather_now["weather"][1]["icon"] + if sunrise <= (now-86400) then now = now - 86400 end + if sunrise <= now and now <= sunset then icon = string.gsub(icon, "n", "d") else