#424: assert that timeout seconds in every naughty notification are numbers

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

diff --git a/widget/weather.lua b/widget/weather.lua
index b75afc8560936fc3936559fba113ff239bb1f81f..c998ed9754f8873e75ea1073620faa10a6e9a3ed 100644 (file)
--- a/widget/weather.lua
+++ b/widget/weather.lua
@@ -1,7 +1,7 @@
 --[[
 
      Licensed under GNU General Public License v2
 --[[
 
      Licensed under GNU General Public License v2

-      * (c) 2015, Luke Bonham
+      * (c) 2015, Luca CPZ

 
 --]]
 
 
 --]]
 


@@ -10,8 +10,11 @@ local json     = require("lain.util").dkjson
 local focused  = require("awful.screen").focused
 local naughty  = require("naughty")
 local wibox    = require("wibox")
 local focused  = require("awful.screen").focused
 local naughty  = require("naughty")
 local wibox    = require("wibox")

-
-local math, os, string, tonumber = math, os, string, tonumber
+local math     = math
+local os       = os
+local string   = string
+local type     = type
+local tonumber = tonumber

 
 -- OpenWeatherMap
 -- current weather and X-days forecast
 
 -- OpenWeatherMap
 -- current weather and X-days forecast


@@ -20,7 +23,7 @@ local math, os, string, tonumber = math, os, string, tonumber
 local function factory(args)
     local weather               = { widget = wibox.widget.textbox() }
     local args                  = args or {}
 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'"
     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'"


@@ -49,7 +52,7 @@ local function factory(args)
     weather.icon_path = icons_path .. "na.png"
     weather.icon = wibox.widget.imagebox(weather.icon_path)
 
     weather.icon_path = icons_path .. "na.png"
     weather.icon = wibox.widget.imagebox(weather.icon_path)
 

-    function weather.show(t_out)
+    function weather.show(seconds)

         weather.hide()
 
         if followtag then
         weather.hide()
 
         if followtag then


@@ -61,12 +64,12 @@ local function factory(args)
             weather.forecast_update()
         end
 
             weather.forecast_update()
         end
 

-        weather.notification = naughty.notify({
+        weather.notification = naughty.notify {
+            preset  = notification_preset,

             text    = weather.notification_text,
             icon    = weather.icon_path,
             text    = weather.notification_text,
             icon    = weather.icon_path,

-            timeout = t_out,
-            preset  = notification_preset
-        })
+            timeout = type(seconds == "number") and seconds or notification_preset.timeout
+        }

     end
 
     function weather.hide()
     end
 
     function weather.hide()


@@ -114,22 +117,18 @@ 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 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
+                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
 
                     sunset  = sunset  + offday
                 end