]> git.madduck.net Git - etc/awesome.git/blobdiff - widgets/yawn/init.lua

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

issue #9 fix
[etc/awesome.git] / widgets / yawn / init.lua
index 4c90df4c440795f7e8e4e59f66f4374776e69078..38b741a3c9b9c090d8982b9aa0bf660f344f252c 100644 (file)
@@ -71,7 +71,15 @@ local function fetch_weather()
 
     -- 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", "")
@@ -131,7 +139,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()