X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/7a4d6f5ffa594603ef83bc8b0e9945d12e082490..8d37b9a1e4521a220f20ce2e1414f656aa3a5015:/widgets/yawn/init.lua?ds=inline diff --git a/widgets/yawn/init.lua b/widgets/yawn/init.lua index f248e25..9bed983 100644 --- a/widgets/yawn/init.lua +++ b/widgets/yawn/init.lua @@ -1,16 +1,13 @@ --[[ - - 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 beautiful = require("beautiful") local naughty = require("naughty") local wibox = require("wibox") @@ -26,15 +23,13 @@ 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(''), + notification_preset = {} } local project_path = debug.getinfo(1, 'S').source:match[[^@(.*/).*$]] @@ -47,34 +42,32 @@ 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 settings = function() end +local function 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) + f:close() + + -- handle no suitable icon found + yawn.icon:set_image(icon_path .. "na.png") -- 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" + 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 @@ -92,8 +85,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")) @@ -114,19 +107,11 @@ local function fetch_weather(args) 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 - -- Localization local f = io.open(localizations_path .. language, "r") if language:find("en_") == nil and f ~= nil then - io.close(f) + f:close() for line in io.lines(localizations_path .. language) do word = string.sub(line, 1, line:find("|")-1) @@ -136,19 +121,18 @@ local function fetch_weather(args) 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) + widget = wibox.widget.textbox() - if toshow == "forecast" then - return yawn.forecast - elseif toshow == "units" then - return yawn.units - else -- "both" - return yawn.forecast .. spr - .. yawn.units .. footer - end + forecast = weather_data:match(": %S+.-,"):gsub(": ", ""):gsub(",", "\n") + units = units:gsub(" ", "") + notification_preset = {} + -- anche notification preset, con fg, bg e position + + settings() + + yawn.widget = widget + yawn.notification_preset = notification_preset end function yawn.hide() @@ -161,46 +145,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.notification_color + timeout = t_out }) 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, fetch_weather) yawn.icon:connect_signal("mouse::enter", function() yawn.show(0) @@ -208,6 +175,8 @@ function yawn.register(id, args) yawn.icon:connect_signal("mouse::leave", function() yawn.hide() end) + + return { icon = yawn.icon, widget = yawn.widget } end function yawn.attach(widget, id, args) @@ -222,6 +191,4 @@ function yawn.attach(widget, id, args) end) end --- }}} - return setmetatable(yawn, { __call = function(_, ...) return yawn.register(...) end })