issue #9 2nd attempt fix

[etc/awesome.git] / widgets / yawn / init.lua

diff --git a/widgets/yawn/init.lua b/widgets/yawn/init.lua
index 4d14966b17e827df82d1963ece8dd5989f3aaa00..38b741a3c9b9c090d8982b9aa0bf660f344f252c 100644 (file)
--- a/widgets/yawn/init.lua
+++ b/widgets/yawn/init.lua
@@ -43,7 +43,7 @@ local city_id             = nil
 local sky                 = nil
 local settings            = function() end
 
 local sky                 = nil
 local settings            = function() end
 

-notification_preset = {}
+yawn_notification_preset = {}

 
 local function fetch_weather()
     local url = api_url .. units_set .. city_id
 
 local function fetch_weather()
     local url = api_url .. units_set .. city_id


@@ -56,6 +56,7 @@ local function fetch_weather()
     -- widgets won't display
     if text == "" or text:match("City not found")
     then
     -- widgets won't display
     if text == "" or text:match("City not found")
     then

+        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")
         if text == "" then
             weather_data = "Service not available at the moment."
             yawn.widget:set_text("N/A")


@@ -70,7 +71,15 @@ local function fetch_weather()
 
     -- Processing raw data
     weather_data = text:gsub("<.->", "")
 
     -- 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", "")
     weather_data = weather_data:gsub("Current Conditions:.-\n", "Now: ")
     weather_data = weather_data:gsub("Forecast:.-\n", "")
     weather_data = weather_data:gsub("\nFull", "")


@@ -130,7 +139,7 @@ local function fetch_weather()
     yawn.icon:set_image(sky)
     widget = yawn.widget
 
     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()
     units = units:gsub(" ", "")
 
     settings()


@@ -152,7 +161,7 @@ function yawn.show(t_out)
     yawn.hide()
 
     notification = naughty.notify({
     yawn.hide()
 
     notification = naughty.notify({

-        preset = notification_preset,
+        preset = yawn_notification_preset,

         text = weather_data,
         icon = sky,
         timeout = t_out
         text = weather_data,
         icon = sky,
         timeout = t_out