allow to define in supported widgets which don't allow it already

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

diff --git a/widgets/weather.lua b/widgets/weather.lua
index d1624fa4d4704ffa648c697d63b090dd8d642b32..53ae8383d379a026166b6321b0a57aa9d92f7008 100644 (file)
--- a/widgets/weather.lua
+++ b/widgets/weather.lua
@@ -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"])
@@ -103,7 +103,7 @@ 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)
 
@@ -121,8 +121,8 @@ local function worker(args)
 
     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