X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/94fe36d0c74a4c620e02c3e861b41eff39e6eed4..89bad3b56b7a76318113f3831b74c156044aa34b:/widgets/weather.lua

diff --git a/widgets/weather.lua b/widgets/weather.lua
index 7673284..53ae838 100644
--- a/widgets/weather.lua
+++ b/widgets/weather.lua
@@ -30,7 +30,7 @@ local function worker(args)
     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'"
     local forecast_call         = "curl -s 'http://api.openweathermap.org/data/2.5/forecast/daily?id=%s&units=%s&lang=%s&cnt=%s'"
-    local city_id               = args.city_id
+    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
@@ -71,7 +71,7 @@ local function worker(args)
     function weather.forecast_update()
         local cmd = string.format(forecast_call, city_id, units, lang, cnt)
         async.request(cmd, function(f)
-            j = f:read("*a")
+            j = f:read("*all")
             f:close()
             weather_now, pos, err = json.decode(j, 1, nil)
 
@@ -79,7 +79,7 @@ local function worker(args)
                 weather.notification_text = ''
                 for i = 1, weather_now["cnt"] do
                     local f = assert(io.popen(string.format(date_cmd, weather_now["list"][i]["dt"])))
-                    day = string.gsub(f:read("a"), "\n", "")
+                    day = string.gsub(f:read("*all"), "\n", "")
                     f:close()
 
                     tmin = math.floor(weather_now["list"][i]["temp"]["min"])
@@ -93,6 +93,9 @@ local function worker(args)
                         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"
             end
         end)
     end
@@ -100,26 +103,26 @@ local function worker(args)
     function weather.update()
         local cmd = string.format(current_call, city_id, units, lang)
         async.request(cmd, function(f)
-            j = f:read("*a")
+            j = f:read("*all")
             f:close()
             weather_now, pos, err = json.decode(j, 1, nil)
 
-            if err then
-                weather.widget.set_text("N/A")
-                weather.icon:set_image(icons_path .. "na.png")
-            elseif tonumber(weather_now["cod"]) == 200 then
+            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")
             end
         end)
     end
 
     weather.attach(weather.widget)
 
-    newtimer("weather", timeout, weather.update)
-    newtimer("weather_forecast", timeout, weather.forecast_update)
+    newtimer("weather-" .. city_id, timeout, weather.update)
+    newtimer("weather_forecast" .. city_id, timeout, weather.forecast_update)
 
     return setmetatable(weather, { __index = weather.widget })
 end