]> 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:

wiki submodule updated
[etc/awesome.git] / widgets / yawn / init.lua
index da2b856f033483329b9bccccb8bc1f6fd3c83674..1f6b0f4f2276d25dce705cf45cfdae1d996cd656 100644 (file)
@@ -7,12 +7,14 @@
 --]]
 
 local newtimer     = require("lain.helpers").newtimer
+local async        = require("lain.asyncshell")
 
 local naughty      = require("naughty")
 local wibox        = require("wibox")
 
 local debug        = { getinfo = debug.getinfo }
-local io           = io
+local io           = { lines   = io.lines,
+                       open    = io.open }
 local os           = { date    = os.date,
                        getenv  = os.getenv }
 local string       = { find    = string.find,
@@ -43,103 +45,106 @@ local city_id             = nil
 local sky                 = nil
 local settings            = function() end
 
-yawn_notification_preset = {}
+yawn_notification_preset  = {}
 
-local function fetch_weather()
+function yawn.fetch_weather()
     local url = api_url .. units_set .. city_id
-    local f = io.popen("curl --connect-timeout 1 -fsm 3 '" .. url .. "'" )
-    local text = f:read("*all")
-    f:close()
+    local cmd = "curl --connect-timeout 1 -fsm 3 '" .. url .. "'"
 
-    -- In case of no connection or invalid city ID
-    -- 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 ")
-        else
-            weather_data = "City not found!\n" ..
-                           "Are you sure " .. city_id ..
-                           " is your Yahoo city ID?"
-            yawn.widget:set_text(" ? ")
+    async.request(cmd, function(f)
+        local text = f:read("*a")
+        f:close()
+
+        -- In case of no connection or invalid city ID
+        -- 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 ")
+            else
+                weather_data = "City not found!\n" ..
+                               "Are you sure " .. city_id ..
+                               " is your Yahoo city ID?"
+                yawn.widget:set_text(" ? ")
+            end
+            return
         end
-        return
-    end
 
-    -- Processing raw data
-    weather_data = text:gsub("<.->", "")
-    weather_data = weather_data:match("Current Conditions:.-Full") or ""
+        -- Processing raw data
+        weather_data = text:gsub("<.->", "")
+        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
+        -- 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("[\n]$", "")
-    weather_data = weather_data:gsub(" [-] " , ": ")
-    weather_data = weather_data:gsub("[.]", ",")
-    weather_data = weather_data:gsub("High: ", "")
-    weather_data = weather_data:gsub(" Low: ", " - ")
-
-    -- Getting info for text widget
-    local now      = weather_data:sub(weather_data:find("Now:")+5,
-                     weather_data:find("\n")-1)
-    forecast       = now:sub(1, now:find(",")-1)
-    units          = now:sub(now:find(",")+2, -2)
-
-    -- Day/Night icon change
-    local hour = tonumber(os.date("%H"))
-    sky = icon_path
-
-    if forecast == "Clear"         or
-       forecast == "Fair"          or
-       forecast == "Partly Cloudy" or
-       forecast == "Mostly Cloudy"
-       then
-           if hour >= 6 and hour <= 18
+        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("[\n]$", "")
+        weather_data = weather_data:gsub(" [-] " , ": ")
+        weather_data = weather_data:gsub("[.]", ",")
+        weather_data = weather_data:gsub("High: ", "")
+        weather_data = weather_data:gsub(" Low: ", " - ")
+
+        -- Getting info for text widget
+        local now      = weather_data:sub(weather_data:find("Now:")+5,
+                         weather_data:find("\n")-1)
+        forecast       = now:sub(1, now:find(",")-1)
+        units          = now:sub(now:find(",")+2, -2)
+
+        -- Day/Night icon change
+        local hour = tonumber(os.date("%H"))
+        sky = icon_path
+
+        if string.find(forecast, "Clear")         or
+           string.find(forecast, "Fair")          or
+           string.find(forecast, "Partly Cloudy") or
+           string.find(forecast, "Mostly Cloudy")
            then
-               sky = sky .. "Day"
-           else
-               sky = sky .. "Night"
-           end
-    end
+               if hour >= 6 and hour <= 18
+               then
+                   sky = sky .. "Day"
+               else
+                   sky = sky .. "Night"
+               end
+        end
 
-    sky = sky  .. forecast:gsub(" ", ""):gsub("/", "") .. ".png"
+        sky = sky  .. forecast:gsub(" ", ""):gsub("/", "") .. ".png"
 
-    -- In case there's no defined icon for current forecast
-    if io.open(sky) == nil then
-        sky = icon_path .. "na.png"
-    end
+        -- In case there's no defined icon for current forecast
+        if io.open(sky) == nil then
+            sky = icon_path .. "na.png"
+        end
 
-    -- Localization
-    local f = io.open(localizations_path .. language, "r")
-    if language:find("en_") == nil and f ~= nil
-    then
-        f:close()
-        for line in io.lines(localizations_path .. language)
-        do
-            word = string.sub(line, 1, line:find("|")-1)
-            translation = string.sub(line, line:find("|")+1)
-            weather_data = string.gsub(weather_data, word, translation)
+        -- Localization
+        local f = io.open(localizations_path .. language, "r")
+        if language:find("en_") == nil and f ~= nil
+        then
+            f:close()
+            for line in io.lines(localizations_path .. language)
+            do
+                word = string.sub(line, 1, line:find("|")-1)
+                translation = string.sub(line, line:find("|")+1)
+                weather_data = string.gsub(weather_data, word, translation)
+            end
         end
-    end
 
-    -- Finally setting infos
-    yawn.icon:set_image(sky)
-    widget = yawn.widget
+        -- Finally setting infos
+        yawn.icon:set_image(sky)
+        widget = yawn.widget
 
-    _data = weather_data:match(": %S.-,") or weather_data
-    forecast = _data:gsub(": ", ""):gsub(",", "")
-    units = units:gsub(" ", "")
+        _data = weather_data:match(": %S.-,") or weather_data
+        forecast = _data:gsub(": ", ""):gsub(",", "")
+        units = units:gsub(" ", "")
 
-    settings()
+        settings()
+    end)
 end
 
 function yawn.hide()
@@ -152,7 +157,7 @@ end
 function yawn.show(t_out)
     if yawn.widget._layout.text:match("?")
     then
-        fetch_weather(settings)
+        yawn.fetch_weather()
     end
 
     yawn.hide()
@@ -162,7 +167,6 @@ function yawn.show(t_out)
         text = weather_data,
         icon = sky,
         timeout = t_out,
-        screen = client.focus and client.focus.screen or 1
     })
 end
 
@@ -175,7 +179,7 @@ function yawn.register(id, args)
 
     city_id = id
 
-    newtimer("yawn", timeout, fetch_weather)
+    newtimer("yawn", timeout, yawn.fetch_weather)
 
     yawn.icon:connect_signal("mouse::enter", function()
         yawn.show(0)