X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/fc7403534f847a02e9f3862fbfec4335a46c1879..321274e33237aefa896eabcf6fb0b2c439cd2bdb:/widgets/weather.lua

diff --git a/widgets/weather.lua b/widgets/weather.lua
index 3df309a..3512f22 100644
--- a/widgets/weather.lua
+++ b/widgets/weather.lua
@@ -18,9 +18,11 @@ local wibox        = require("wibox")
 
 local math         = { floor  = math.floor }
 local mouse        = mouse
+local os           = { time   = os.time }
 local string       = { format = string.format,
                        gsub   = string.gsub }
 
+local tonumber     = tonumber
 local setmetatable = setmetatable
 
 -- OpenWeatherMap
@@ -33,12 +35,13 @@ local function worker(args)
     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 current_call          = "curl -s 'http://api.openweathermap.org/data/2.5/weather?id=%s&units=%s&lang=%s&APPID=%s'"
-    local forecast_call         = "curl -s 'http://api.openweathermap.org/data/2.5/forecast/daily?id=%s&units=%s&lang=%s&cnt=%s&APPID=%s'"
+    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                   = args.utc or 0
     local units                 = args.units or "metric"
     local lang                  = args.lang or "en"
-    local cnt                   = args.cnt or 7
+    local cnt                   = args.cnt or 5
     local date_cmd              = args.date_cmd or "date -u -d @%d +'%%a %%d'"
     local icons_path            = args.icons_path or lain_icons .. "openweathermap/"
     local notification_preset   = args.notification_preset or {}
@@ -66,6 +69,11 @@ local function worker(args)
             notification_preset.screen = mouse.screen
         end
 
+        if not weather.notification_text then
+            weather.forecast_update()
+        end
+
+
         weather.notification = naughty.notify({
             text    = weather.notification_text,
             icon    = weather.icon_path,
@@ -106,8 +114,6 @@ local function worker(args)
                         weather.notification_text = weather.notification_text .. "\n"
                     end
                 end
-            else
-                weather.notification_text = "API/connection error or invalid city ID"
             end
         end)
     end
@@ -115,11 +121,26 @@ local function worker(args)
     function weather.update()
         local cmd = string.format(current_call, city_id, units, lang, APPID)
         async.request(cmd, function(f)
-            local pos, err
+            local pos, err, icon
             weather_now, pos, err = json.decode(f, 1, nil)
 
-            if not err and weather_now ~= nil and tonumber(weather_now["cod"]) == 200 then
-                weather.icon_path = icons_path .. weather_now["weather"][1]["icon"] .. ".png"
+            if not err and weather_now and tonumber(weather_now["cod"]) == 200 then
+                -- weather icon based on localtime
+                now     = os.time()
+                sunrise = tonumber(weather_now["sys"]["sunrise"])
+                sunset  = tonumber(weather_now["sys"]["sunset"])
+                icon    = weather_now["weather"][1]["icon"]
+
+                if sunrise <= (now-86400) then now = now - 86400 end
+
+                if sunrise <= now and now <= sunset then
+                    icon = string.gsub(icon, "n", "d")
+                else
+                    icon = string.gsub(icon, "d", "n")
+                end
+
+                weather.icon_path = icons_path .. icon .. ".png"
+
                 widget = weather.widget
                 settings()
             else
@@ -134,7 +155,7 @@ local function worker(args)
     weather.attach(weather.widget)
 
     newtimer("weather-" .. city_id, timeout, weather.update)
-    newtimer("weather_forecast-" .. city_id, timeout, weather.forecast_update, nil)
+    newtimer("weather_forecast-" .. city_id, timeout, weather.forecast_update)
 
     return setmetatable(weather, { __index = weather.widget })
 end