Merge pull request #420 from sim590/unpack-lua51-compat

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

diff --git a/widget/weather.lua b/widget/weather.lua
index 17fc4d7b2e72a861b115a13adaf39ae4b65cbe05..f35ca68b2e72ffb7e6326744197753d117ffcc62 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, Luca CPZ
+
 --]]
 
 local helpers  = require("lain.helpers")
@@ -11,11 +10,9 @@ 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 math     = math
+local os       = os
+local string   = string
 local tonumber = tonumber
 
 -- OpenWeatherMap
@@ -25,7 +22,7 @@ local tonumber = tonumber
 local function factory(args)
     local weather               = { widget = wibox.widget.textbox() }
     local args                  = args or {}
-    local APPID                 = args.APPID or "3e321f9414eaedbfab34983bda77a66e" -- lain default
+    local APPID                 = args.APPID or "3e321f9414eaedbfab34983bda77a66e" -- lain's default
     local timeout               = args.timeout or 60 * 15 -- 15 min
     local timeout_forecast      = args.timeout or 60 * 60 * 24 -- 24 hrs
     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'"
@@ -116,12 +113,25 @@ 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 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
 
-                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")