X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/25e2f9a60e0cc6fc94d9f28d606f85324396ae38..af30c92b12e46a3b9deb94859950c90c63d1c7b1:/widgets/weather.lua

diff --git a/widgets/weather.lua b/widgets/weather.lua
index 68abae9..3df309a 100644
--- a/widgets/weather.lua
+++ b/widgets/weather.lua
@@ -30,7 +30,7 @@ local setmetatable = setmetatable
 local function worker(args)
     local weather               = {}
     local args                  = args or {}
-    local APPID                = args.APPID or 1 -- mandatory
+    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'"
@@ -43,14 +43,21 @@ local function worker(args)
     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
     local settings              = args.settings or function() end
 
-    weather.widget = wibox.widget.textbox('')
-    weather.icon   = wibox.widget.imagebox()
+    weather.widget    = wibox.widget.textbox(weather_na_markup)
+    weather.icon_path = icons_path .. "na.png"
+    weather.icon      = wibox.widget.imagebox(weather.icon_path)
 
     function weather.show(t_out)
         weather.hide()
@@ -68,7 +75,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
@@ -89,25 +96,18 @@ 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.icon_path = icons_path .. "na.png"
-                weather.notification_text = "API/connection error or bad/not set city ID"
+                weather.notification_text = "API/connection error or invalid city ID"
             end
         end)
     end
@@ -120,20 +120,21 @@ local function worker(args)
 
             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.icon:set_image(weather.icon_path)
                 widget = weather.widget
                 settings()
             else
-                weather.widget._layout.text = " N/A " -- tries to avoid textbox bugs
-                weather.icon:set_image(icons_path .. "na.png")
+                weather.icon_path = icons_path .. "na.png"
+                weather.widget:set_markup(weather_na_markup)
             end
+
+            weather.icon:set_image(weather.icon_path)
         end)
     end
 
     weather.attach(weather.widget)
 
     newtimer("weather-" .. city_id, timeout, weather.update)
-    newtimer("weather_forecast-" .. city_id, timeout, weather.forecast_update)
+    newtimer("weather_forecast-" .. city_id, timeout, weather.forecast_update, nil)
 
     return setmetatable(weather, { __index = weather.widget })
 end