modified: widgets/weather.lua - fixed +- 1 day difference due

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

diff --git a/widgets/weather.lua b/widgets/weather.lua
index 3df309a3531e1e8425d0da4e3b7604ccba4b10b9..df3404003b7134b5dde5bedc11ccae1f0cb8d53f 100644 (file)
--- a/widgets/weather.lua
+++ b/widgets/weather.lua
@@ -33,12 +33,12 @@ 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 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,8 +66,16 @@ local function worker(args)
             notification_preset.screen = mouse.screen
         end
 
+        if not weather.notification_text then
+            weather.forecast_update()
+        end
+
+        if not weather.current_text then
+            weather.update()
+        end
+
         weather.notification = naughty.notify({
-            text    = weather.notification_text,
+            text    = weather.current_text .. weather.notification_text,
             icon    = weather.icon_path,
             timeout = t_out,
             preset  = notification_preset
@@ -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,12 +121,24 @@ 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, sunrise, sunset, current_dt, datetime, 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"
+            weather.current_text=''
+            if not err and weather_now and tonumber(weather_now["cod"]) == 200 then
+                current_dt = os.time()
+                sunrise = weather_now["sys"]["sunrise"]
+                sunset  = weather_now["sys"]["sunset"]
+                if current_dt> sunrise and current_dt> sunset then current_dt = current_dt - 86400 end
+                if current_dt > sunrise and current_dt < sunset then 
+                    datetime="d"
+                else
+                    datetime="n"
+                end
+                -- error("dt sr:" .. sunrise .. "ss: " .. sunset .. "dt: " .. current_dt .. "d/n: " .. datetime .. "hehe")
+                icon = weather_now["weather"][1]["icon"]
+                weather.icon_path = icons_path .. icon:sub(1,2) .. datetime .. ".png"
                 widget = weather.widget
+                weather.current_text = "Now:" .. weather_now["weather"][1]["description"] .. "\n"
                 settings()
             else
                 weather.icon_path = icons_path .. "na.png"
@@ -134,7 +152,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