wiki updated

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

diff --git a/widgets/yawn/init.lua b/widgets/yawn/init.lua
index 20c90b182a51664531551dadeebb019cd48cd271..2306fed0d08fd9a409fb2d55e5ab91bee399a645 100644 (file)
--- a/widgets/yawn/init.lua
+++ b/widgets/yawn/init.lua
@@ -6,9 +6,8 @@
                                                   
 --]]
 
-local markup       = require("lain.util.markup")
+local newtimer     = require("lain.helpers").newtimer
 
-local beautiful    = require("beautiful")
 local naughty      = require("naughty")
 local wibox        = require("wibox")
 
@@ -28,30 +27,27 @@ local setmetatable = setmetatable
 -- lain.widgets.yawn
 local yawn =
 {
-    units    = "",
-    forecast = "",
-    icon     = wibox.widget.imagebox(),
-    widget   = wibox.widget.textbox()
+    icon   = wibox.widget.imagebox(),
+    widget = wibox.widget.textbox('')
 }
 
-local project_path       = debug.getinfo(1, 'S').source:match[[^@(.*/).*$]]
-local localizations_path = project_path .. 'localizations/'
-local icon_path          = project_path .. 'icons/'
-local api_url            = 'http://weather.yahooapis.com/forecastrss'
-local units_set          = '?u=c&w=' -- Default is Celsius
-local language           = string.match(os.getenv("LANG"), "(%S*$*)[.]")
-local weather_data       = nil
-local notification       = nil
-local city_id            = nil
-local sky                = nil
-local settings           = {}
-local update_timer       = nil
-
-local function fetch_weather(args)
-    local toshow = args.toshow or "forecast"
-
+local project_path        = debug.getinfo(1, 'S').source:match[[^@(.*/).*$]]
+local localizations_path  = project_path .. 'localizations/'
+local icon_path           = project_path .. 'icons/'
+local api_url             = 'http://weather.yahooapis.com/forecastrss'
+local units_set           = '?u=c&w=' -- Default is Celsius
+local language            = string.match(os.getenv("LANG"), "(%S*$*)[.]")
+local weather_data        = nil
+local notification        = nil
+local city_id             = nil
+local sky                 = nil
+local settings            = function() end
+
+yawn_notification_preset = {}
+
+local function fetch_weather()
     local url = api_url .. units_set .. city_id
-    local f = io.popen("curl --connect-timeout 1 -fsm 2 '"
+    local f = io.popen("curl --connect-timeout 1 -fsm 1 '"
                        .. url .. "'" )
     local text = f:read("*all")
     f:close()
@@ -60,17 +56,17 @@ local function fetch_weather(args)
     -- widgets won't display
     if text == "" or text:match("City not found")
     then
-        sky = icon_path .. "na.png"
-        yawn.icon:set_image(sky)
+        yawn.icon:set_image(icon_path .. "na.png")
         if text == "" then
             weather_data = "Service not available at the moment."
-            return "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?"
-            return "?"
+            yawn.widget:set_text("?")
         end
+        return
     end
 
     -- Processing raw data
@@ -88,8 +84,8 @@ local function fetch_weather(args)
     -- Getting info for text widget
     local now      = weather_data:sub(weather_data:find("Now:")+5,
                      weather_data:find("\n")-1)
-    local forecast = now:sub(1, now:find(",")-1)
-    local units    = now:sub(now:find(",")+2, -2)
+    forecast       = now:sub(1, now:find(",")-1)
+    units          = now:sub(now:find(",")+2, -2)
 
     -- Day/Night icon change
     local hour = tonumber(os.date("%H"))
@@ -115,7 +111,7 @@ local function fetch_weather(args)
     if f == nil then
         sky = icon_path .. "na.png"
     else
-        f:close()
+        io.close(f)
     end
 
     -- Localization
@@ -132,21 +128,13 @@ local function fetch_weather(args)
     end
 
     -- Finally setting infos
-    both = weather_data:match(": %S+.-\n"):gsub(": ", "")
-    forecast = weather_data:match(": %S+.-,"):gsub(": ", ""):gsub(",", "\n")
-    units = units:gsub(" ", "")
-
-    yawn.forecast = markup(yawn.color, " " .. markup.font(beautiful.font, forecast) .. " ")
-    yawn.units = markup(yawn.color, " " .. markup.font(beautiful.font, units))
     yawn.icon:set_image(sky)
+    widget = yawn.widget
 
-    if toshow == "forecast" then
-        return yawn.forecast
-    elseif toshow == "units" then
-        return yawn.units
-    else
-        return both 
-    end
+    forecast = weather_data:match(": %S.-,"):gsub(": ", ""):gsub(",", "")
+    units = units:gsub(" ", "")
+
+    settings()
 end
 
 function yawn.hide()
@@ -159,41 +147,29 @@ end
 function yawn.show(t_out)
     if yawn.widget._layout.text == "?"
     then
-        if update_timer ~= nil
-        then
-            update_timer:emit_signal("timeout")
-        else
-            fetch_weather(settings)
-        end
+        fetch_weather(settings)
     end
 
     yawn.hide()
 
     notification = naughty.notify({
+        preset = yawn_notification_preset,
         text = weather_data,
         icon = sky,
-        timeout = t_out,
-        fg = yawn.color
+        timeout = t_out
     })
 end
 
 function yawn.register(id, args)
-    local args = args or {}
-
-    settings = args 
-
-    yawn.color = args.color or beautiful.fg_normal or "#FFFFFF"
+    local args     = args or {}
+    local timeout  = args.timeout or 600
+    settings       = args.settings or function() end
 
     if args.u == "f" then units_set = '?u=f&w=' end
 
     city_id = id
 
-    update_timer = timer({ timeout = 600 }) -- 10 mins
-    update_timer:connect_signal("timeout", function()
-        yawn.widget:set_markup(fetch_weather(settings))
-    end)
-    update_timer:start()
-    update_timer:emit_signal("timeout")
+    newtimer("yawn", timeout, fetch_weather)
 
     yawn.icon:connect_signal("mouse::enter", function()
         yawn.show(0)
@@ -217,6 +193,4 @@ function yawn.attach(widget, id, args)
     end)
 end
 
--- }}}
-
 return setmetatable(yawn, { __call = function(_, ...) return yawn.register(...) end })