X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/4bde4b5eea6ad1352078228c0d146f41b4c893e4..b46ced57bc9d62ed7956859bcd3eb82ba8156ea4:/widgets/yawn/init.lua

diff --git a/widgets/yawn/init.lua b/widgets/yawn/init.lua
index 4c90df4..36cdf54 100644
--- a/widgets/yawn/init.lua
+++ b/widgets/yawn/init.lua
@@ -1,4 +1,3 @@
-
 --[[
                                                   
      Licensed under GNU General Public License v2 
@@ -47,8 +46,7 @@ yawn_notification_preset = {}
 
 local function fetch_weather()
     local url = api_url .. units_set .. city_id
-    local f = io.popen("curl --connect-timeout 1 -fsm 1 '"
-                       .. url .. "'" )
+    local f = io.popen("curl --connect-timeout 1 -fsm 3 '" .. url .. "'" )
     local text = f:read("*all")
     f:close()
 
@@ -59,19 +57,27 @@ local function fetch_weather()
         yawn.icon:set_image(icon_path .. "na.png")
         if text == "" then
             weather_data = "Service not available at the moment."
-            yawn.widget:set_text("N/A")
+            yawn.widget:set_text(" N/A")
         else
             weather_data = "City not found!\n" ..
                            "Are you sure " .. city_id ..
                            " is your Yahoo city ID?"
-            yawn.widget:set_text("?")
+            yawn.widget:set_text(" ?")
         end
         return
     end
 
     -- Processing raw data
     weather_data = text:gsub("<.->", "")
-    weather_data = weather_data:match("Current Conditions:.-Full")
+    weather_data = weather_data:match("Current Conditions:.-Full") or ""
+
+    -- may still happens in case of bad connectivity
+    if weather_data == "" then
+        yawn.icon:set_image(icon_path .. "na.png")
+        yawn.widget:set_text(" ?")
+        return
+    end
+
     weather_data = weather_data:gsub("Current Conditions:.-\n", "Now: ")
     weather_data = weather_data:gsub("Forecast:.-\n", "")
     weather_data = weather_data:gsub("\nFull", "")
@@ -107,11 +113,8 @@ local function fetch_weather()
     sky = sky  .. forecast:gsub(" ", ""):gsub("/", "") .. ".png"
 
     -- In case there's no defined icon for current forecast
-    f = io.popen(sky)
-    if f == nil then
+    if io.open(sky) == nil then
         sky = icon_path .. "na.png"
-    else
-        io.close(f)
     end
 
     -- Localization
@@ -131,7 +134,7 @@ local function fetch_weather()
     yawn.icon:set_image(sky)
     widget = yawn.widget
 
-    forecast = weather_data:match(": %S+.-,"):gsub(": ", ""):gsub(",", "\n")
+    forecast = weather_data:match(": %S.-,"):gsub(": ", ""):gsub(",", "")
     units = units:gsub(" ", "")
 
     settings()
@@ -145,7 +148,7 @@ function yawn.hide()
 end
 
 function yawn.show(t_out)
-    if yawn.widget._layout.text == "?"
+    if yawn.widget._layout.text:match("?")
     then
         fetch_weather(settings)
     end