]> git.madduck.net Git - etc/awesome.git/blobdiff - widget/weather.lua

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

centerwork: remove capi reference
[etc/awesome.git] / widget / weather.lua
index 82c8ebf4b2edbe70b75b404a9d0ee6400fdef826..a9b886a12f9ea3df7774595e8b96c18f00bcb45f 100644 (file)
@@ -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,13 +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,
-                   difftime = os.difftime }
-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
@@ -26,17 +20,12 @@ 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 timeout               = args.timeout or 900   -- 15 min
-    local timeout_forecast      = args.timeout or 86400 -- 24 hrs
+    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'"
     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
@@ -103,11 +92,10 @@ 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
-                weather.notification_text = ''
+                weather.notification_text = ""
                 for i = 1, weather_now["cnt"] do
                     weather.notification_text = weather.notification_text ..
                                                 notification_text_fun(weather_now["list"][i])
-
                     if i < weather_now["cnt"] then
                         weather.notification_text = weather.notification_text .. "\n"
                     end
@@ -123,29 +111,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
-                -- weather icon based on localtime
-                local now     = os.time()
                 local sunrise = tonumber(weather_now["sys"]["sunrise"])
                 local sunset  = tonumber(weather_now["sys"]["sunset"])
                 local icon    = weather_now["weather"][1]["icon"]
-                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 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
-                end
-
-                -- if we are 1 day after the GMT, return 1 day back, and viceversa
-                if offset > 0 and loc_m >= utc_m then
-                    now = now - 86400
-                elseif offset < 0 and loc_m <= utc_m then
-                    now = now + 86400
+                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")