Merge branch 'master' of http://github.com/copycat-killer/lain into fix/pulse-sink

[etc/awesome.git] / widget / weather.lua

diff --git a/widget/weather.lua b/widget/weather.lua
index 17fc4d7b2e72a861b115a13adaf39ae4b65cbe05..b75afc8560936fc3936559fba113ff239bb1f81f 100644 (file)
--- a/widget/weather.lua
+++ b/widget/weather.lua
@@ -1,9 +1,8 @@
-
 --[[
-                                                  
-     Licensed under GNU General Public License v2 
-      * (c) 2015, Luke Bonham                     
-                                                  
+
+     Licensed under GNU General Public License v2
+      * (c) 2015, Luke Bonham
+
 --]]
 
 local helpers  = require("lain.helpers")
@@ -11,12 +10,8 @@ local json     = require("lain.util").dkjson
 local focused  = require("awful.screen").focused
 local naughty  = require("naughty")
 local wibox    = require("wibox")
-local math     = { floor  = math.floor }
-local os       = { time   = os.time,
-                   date   = os.date }
-local string   = { format = string.format,
-                   gsub   = string.gsub }
-local tonumber = tonumber
+
+local math, os, string, tonumber = math, os, string, tonumber
 
 -- OpenWeatherMap
 -- current weather and X-days forecast
@@ -116,12 +111,29 @@ local function factory(args)
             weather_now, pos, err = json.decode(f, 1, nil)
 
             if not err and type(weather_now) == "table" and tonumber(weather_now["cod"]) == 200 then
-                local now     = os.time(os.date("!*t"))
                 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 loc_m   = os.time { year = os.date("%Y"), month = os.date("%m"), day = os.date("%d"), hour = 0 }
+                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")