X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/046b0279b0f3eb827bcc2b2e395e6ea69c019733..2968bb25bdaa35c950ad112d682be16104df131e:/widgets/yawn/init.lua?ds=sidebyside
diff --git a/widgets/yawn/init.lua b/widgets/yawn/init.lua
index f248e25..be3e614 100644
--- a/widgets/yawn/init.lua
+++ b/widgets/yawn/init.lua
@@ -1,21 +1,20 @@
--[[
-
- Yahoo's Awesome (WM) Weather Notification
-
- Licensed under WTFPL v2
- * (c) 2013, Luke Bonham
-
+
+ Licensed under GNU General Public License v2
+ * (c) 2013, Luke Bonham
+
--]]
-local markup = require("lain.util.markup")
+local newtimer = require("lain.helpers").newtimer
+local async = require("lain.asyncshell")
-local beautiful = require("beautiful")
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,
@@ -26,129 +25,126 @@ local tonumber = tonumber
local setmetatable = setmetatable
--- yawn integration
--- https://github.com/copycat-killer/yawn
+-- YAhoo! Weather Notification
-- 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 spr = args.spr or " "
- local footer = args.footer or ""
-
+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*$*)[.]") or "en_US" -- if LANG is not set
+local weather_data = nil
+local notification = nil
+local city_id = nil
+local sky = nil
+local settings = function() end
+
+yawn_notification_preset = {}
+
+function yawn.fetch_weather()
local url = api_url .. units_set .. city_id
- local f = io.popen("curl --connect-timeout 1 -fsm 2 '"
- .. url .. "'" )
- local text = f:read("*all")
- io.close(f)
-
- -- In case of no connection or invalid city ID
- -- widgets won't display
- if text == "" or text:match("City not found")
- then
- sky = icon_path .. "na.png"
- if text == "" then
- weather_data = "Service not available at the moment."
- return "N/A"
- else
- weather_data = "City not found!\n" ..
- "Are you sure " .. city_id ..
- " is your Yahoo city ID?"
- return "?"
+ local cmd = "curl --connect-timeout 1 -fsm 3 '" .. url .. "'"
+
+ 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
- end
- -- Processing raw data
- weather_data = text:gsub("<.->", "")
- weather_data = weather_data:match("Current Conditions:.-Full")
- 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)
- local forecast = now:sub(1, now:find(",")-1)
- local 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
+ -- 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
+
+ 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
- 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
- f = io.popen(sky)
- if f == nil then
- sky = icon_path .. "na.png"
- else
- io.close(f)
- 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
- io.close(f)
- 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
- forecast = weather_data:match(": %S+"):gsub(": ", ""):gsub(",", "")
- yawn.forecast = markup(yawn.forecast_color, markup.font(beautiful.font, forecast))
- yawn.units = markup(yawn.units_color, markup.font(beautiful.font, units))
- yawn.icon:set_image(sky)
-
- if toshow == "forecast" then
- return yawn.forecast
- elseif toshow == "units" then
- return yawn.units
- else -- "both"
- return yawn.forecast .. spr
- .. yawn.units .. footer
- end
+ -- 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(" ", "")
+
+ settings()
+ end)
end
function yawn.hide()
@@ -159,48 +155,31 @@ function yawn.hide()
end
function yawn.show(t_out)
- if yawn.widget._layout.text == "?"
+ if yawn.widget._layout.text:match("?")
then
- if update_timer ~= nil
- then
- update_timer:emit_signal("timeout")
- else
- fetch_weather(settings)
- end
+ yawn.fetch_weather()
end
yawn.hide()
notification = naughty.notify({
+ preset = yawn_notification_preset,
text = weather_data,
icon = sky,
timeout = t_out,
- fg = yawn.notification_color
})
end
function yawn.register(id, args)
- local args = args or {}
-
- settings = { args.toshow, args.spr, args.footer }
-
- yawn.units_color = args.units_color or
- beautiful.fg_normal or "#FFFFFF"
- yawn.forecast_color = args.forecast_color or
- yawn.units_color
- yawn.notification_color = args.notification_color or
- beautiful.fg_focus 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, yawn.fetch_weather)
yawn.icon:connect_signal("mouse::enter", function()
yawn.show(0)
@@ -208,6 +187,8 @@ function yawn.register(id, args)
yawn.icon:connect_signal("mouse::leave", function()
yawn.hide()
end)
+
+ return yawn
end
function yawn.attach(widget, id, args)
@@ -222,6 +203,4 @@ function yawn.attach(widget, id, args)
end)
end
--- }}}
-
return setmetatable(yawn, { __call = function(_, ...) return yawn.register(...) end })