From 40d3c9e33af88711c78b50b5eb3d2d48388f796e Mon Sep 17 00:00:00 2001 From: Aleksandr Beliaev Date: Tue, 31 May 2016 14:05:44 +1200 Subject: [PATCH] modified: widgets/weather.lua - seems fixed datetime calculation --- widgets/weather.lua | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/widgets/weather.lua b/widgets/weather.lua index 3512f22..84c1564 100644 --- a/widgets/weather.lua +++ b/widgets/weather.lua @@ -39,6 +39,7 @@ local function worker(args) 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 units = args.units or "metric" local lang = args.lang or "en" local cnt = args.cnt or 5 @@ -120,19 +121,31 @@ local function worker(args) function weather.update() local cmd = string.format(current_call, city_id, units, lang, APPID) + local utc_midnight_cmd = ("date -u -d 'today 00:00:00' +'%%s'") + async.request(cmd, function(f) local pos, err, icon weather_now, pos, err = json.decode(f, 1, nil) if not err and weather_now and tonumber(weather_now["cod"]) == 200 then -- weather icon based on localtime + now = os.time() + utc_midnight = string.gsub(read_pipe(string.format(utc_midnight_cmd)), "\n", "") + + if utc > 0 then + if (now - (utc * 3600)) >= tonumber(utc_midnight) then + now = now - 86400 + end + else + if (now - (utc * 3600)) <= tonumber(utc_midnight) then + now = now + 86400 + end + end 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