From: Aleksandr Beliaev Date: Wed, 6 Sep 2017 01:28:18 +0000 (+1200) Subject: Weather widget working without utc_offset X-Git-Url: https://git.madduck.net/etc/awesome.git/commitdiff_plain/794f5d3220d7793f553b8313b1b71313615fb197?ds=sidebyside;hp=--cc Weather widget working without utc_offset --- 794f5d3220d7793f553b8313b1b71313615fb197 diff --git a/widget/weather.lua b/widget/weather.lua index c7563d5..b75afc8 100644 --- a/widget/weather.lua +++ b/widget/weather.lua @@ -26,11 +26,6 @@ local function factory(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_offset = args.utc_offset or - function () - local now = os.time() - return os.difftime(now, os.time(os.date("!*t", now))) + ((os.date("*t").isdst and 1 or 0) * 3600) - end local units = args.units or "metric" local lang = args.lang or "en" local cnt = args.cnt or 5 @@ -119,19 +114,26 @@ 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 now = os.time() + local loc_now = os.time() local loc_m = os.time { year = os.date("%Y"), month = os.date("%m"), day = os.date("%d"), hour = 0 } - local offset = utc_offset() - local utc_m = loc_m - offset - - -- if we are 1 day after the GMT, return 1 day back, and viceversa - if offset > 0 and (now - utc_m) >= 86400 then - utc_m = utc_m + 86400 - elseif offset < 0 and (utc_m - now) >= 86400 then - utc_m = utc_m - 86400 + local loc_t = os.difftime(loc_now, loc_m) + local loc_d = os.date("*t", loc_now) + local utc_d = os.date("!*t", loc_now) + local utc_now = os.time(utc_d) + local offdt = (loc_d.isdst and 1 or 0) * 3600 + 100 * (loc_d.min - utc_d.min) / 60 + local offset = os.difftime(loc_now, utc_now) + offdt + local offday = (offset < 0 and -86400) or 86400 + + if math.abs(loc_now - utc_now - offdt + loc_t) >= 86400 then + utc_now = utc_now + offday + end + + if offday * (loc_now - utc_now - offdt) > 0 then + sunrise = sunrise + offday + sunset = sunset + offday end - if sunrise <= now and now <= sunset then + if sunrise <= loc_now and loc_now <= sunset then icon = string.gsub(icon, "n", "d") else icon = string.gsub(icon, "d", "n") diff --git a/wiki b/wiki index 1e25033..c221a27 160000 --- a/wiki +++ b/wiki @@ -1 +1 @@ -Subproject commit 1e2503366ea9ca31378bcb374e13f1bae5e4be94 +Subproject commit c221a2725d3968f85615328252b710fe0e60bd9e