X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/7fd4fdbc0fe237a967c542b24fe91cdfd326e3c5..80075e34d5ba4186901d311c0f469aefe0449476:/widgets/weather.lua

diff --git a/widgets/weather.lua b/widgets/weather.lua
index 173601a..ca0ceed 100644
--- a/widgets/weather.lua
+++ b/widgets/weather.lua
@@ -33,18 +33,23 @@ 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 {}
     local notification_text_fun = args.notification_text_fun or
-                                  function (day, desc, tmin, tmax)
-                                      return string.format("<b>%s</b>: %s, %d - %d  ", day, desc, tmin, tmax)
+                                  function (wn)
+                                      local day = string.gsub(read_pipe(string.format(date_cmd, wn["dt"])), "\n", "")
+                                      local tmin = math.floor(wn["temp"]["min"])
+                                      local tmax = math.floor(wn["temp"]["max"])
+                                      local desc = wn["weather"][1]["description"]
+
+                                      return string.format("<b>%s</b>: %s, %d - %d ", day, desc, tmin, tmax)
                                   end
     local weather_na_markup     = args.weather_na_markup or " N/A "
     local followmouse           = args.followmouse or false
@@ -61,9 +66,12 @@ 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
-                      or "Waiting for the server to respond...",
+            text    = weather.notification_text,
             icon    = weather.icon_path,
             timeout = t_out,
             preset  = notification_preset
@@ -71,7 +79,7 @@ local function worker(args)
     end
 
     function weather.hide()
-        if weather.notification ~= nil then
+        if weather.notification then
             naughty.destroy(weather.notification)
             weather.notification = nil
         end
@@ -92,24 +100,16 @@ local function worker(args)
             local pos, err
             weather_now, pos, err = json.decode(f, 1, nil)
 
-            if not err and weather_now ~= nil and tonumber(weather_now["cod"]) == 200 then
+            if not err and weather_now and tonumber(weather_now["cod"]) == 200 then
                 weather.notification_text = ''
                 for i = 1, weather_now["cnt"] do
-                    local day = string.gsub(read_pipe(string.format(date_cmd, weather_now["list"][i]["dt"])), "\n", "")
-
-                    local tmin = math.floor(weather_now["list"][i]["temp"]["min"])
-                    local tmax = math.floor(weather_now["list"][i]["temp"]["max"])
-                    local desc = weather_now["list"][i]["weather"][1]["description"]
-
                     weather.notification_text = weather.notification_text ..
-                                                notification_text_fun(day, desc, tmin, tmax)
+                                                notification_text_fun(weather_now["list"][i])
 
                     if i < weather_now["cnt"] then
                         weather.notification_text = weather.notification_text .. "\n"
                     end
                 end
-            else
-                weather.notification_text = "API/connection error or bad/not set city ID"
             end
         end)
     end
@@ -120,7 +120,7 @@ local function worker(args)
             local pos, err
             weather_now, pos, err = json.decode(f, 1, nil)
 
-            if not err and weather_now ~= nil and tonumber(weather_now["cod"]) == 200 then
+            if not err and weather_now and tonumber(weather_now["cod"]) == 200 then
                 weather.icon_path = icons_path .. weather_now["weather"][1]["icon"] .. ".png"
                 widget = weather.widget
                 settings()