From 9ef2c734cab14737428ce1f03c15a8c4752e09e3 Mon Sep 17 00:00:00 2001 From: Aleksandr Beliaev Date: Mon, 13 May 2019 11:08:46 +1200 Subject: [PATCH] Weather status icon fix --- widget/weather.lua | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/widget/weather.lua b/widget/weather.lua index c998ed9..9c1e797 100644 --- a/widget/weather.lua +++ b/widget/weather.lua @@ -117,20 +117,7 @@ local function factory(args) local sunrise = tonumber(weather_now["sys"]["sunrise"]) local sunset = tonumber(weather_now["sys"]["sunset"]) local icon = weather_now["weather"][1]["icon"] - local loc_now = os.time() -- local time - local loc_m = os.time { year = os.date("%Y"), month = os.date("%m"), day = os.date("%d"), hour = 0 } -- local time from midnight - local loc_d = os.date("*t", loc_now) -- table YMDHMS for current local time (for TZ calculation) - local utc_d = os.date("!*t", loc_now) -- table YMDHMS for current UTC time - local utc_now = os.time(utc_d) -- UTC time now - local offdt = (loc_d.isdst and 1 or 0) * 3600 + 100 * (loc_d.min - utc_d.min) / 60 -- DST offset - local offset = os.difftime(loc_now, utc_now) + (loc_d.isdst and 1 or 0) * 3600 + 100 * (loc_d.min - utc_d.min) / 60 -- TZ offset (including DST) - local offday = (offset < 0 and -86400) or 86400 -- 24 hour correction value (+86400 or -86400) - - -- if current UTC time is earlier then local midnight -> positive offset (negative otherwise) - if offset * (loc_m - utc_now + offdt) > 0 then - sunrise = sunrise + offday -- Shift sunset and sunrise times by 24 hours - sunset = sunset + offday - end + local loc_now = os.time() if sunrise <= loc_now and loc_now <= sunset then icon = string.gsub(icon, "n", "d") -- 2.39.2