X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/94fe36d0c74a4c620e02c3e861b41eff39e6eed4..8e9386be4e00184f426ce1d91ca842460dba8f91:/widgets/weather.lua?ds=sidebyside diff --git a/widgets/weather.lua b/widgets/weather.lua index 7673284..ca0ceed 100644 --- a/widgets/weather.lua +++ b/widgets/weather.lua @@ -7,13 +7,17 @@ --]] local newtimer = require("lain.helpers").newtimer +local read_pipe = require("lain.helpers").read_pipe + local async = require("lain.asyncshell") local json = require("lain.util").dkjson local lain_icons = require("lain.helpers").icons_dir + local naughty = require("naughty") local wibox = require("wibox") local math = { floor = math.floor } +local mouse = mouse local string = { format = string.format, gsub = string.gsub } @@ -26,34 +30,56 @@ local setmetatable = setmetatable local function worker(args) local weather = {} local args = args or {} + local APPID = args.APPID or "3e321f9414eaedbfab34983bda77a66e" -- lain default local timeout = args.timeout or 900 -- 15 min local timeout_forecast = args.timeout or 86400 -- 24 hrs - local current_call = "curl -s 'http://api.openweathermap.org/data/2.5/weather?id=%s&units=%s&lang=%s'" - local forecast_call = "curl -s 'http://api.openweathermap.org/data/2.5/forecast/daily?id=%s&units=%s&lang=%s&cnt=%s'" - local city_id = args.city_id + local current_call = args.current_call or "curl -s 'http://api.openweathermap.org/data/2.5/weather?id=%s&units=%s&lang=%s&APPID=%s'" + local forecast_call = args.forecast_call or "curl -s 'http://api.openweathermap.org/data/2.5/forecast/daily?id=%s&units=%s&lang=%s&cnt=%s&APPID=%s'" + local city_id = args.city_id or 0 -- placeholder local units = args.units or "metric" local lang = args.lang or "en" - local cnt = args.cnt or 7 + local cnt = args.cnt or 5 local date_cmd = args.date_cmd or "date -u -d @%d +'%%a %%d'" local icons_path = args.icons_path or lain_icons .. "openweathermap/" - local w_notification_preset = args.w_notification_preset or {} + local notification_preset = args.notification_preset or {} + local notification_text_fun = args.notification_text_fun or + function (wn) + local day = string.gsub(read_pipe(string.format(date_cmd, wn["dt"])), "\n", "") + local tmin = math.floor(wn["temp"]["min"]) + local tmax = math.floor(wn["temp"]["max"]) + local desc = wn["weather"][1]["description"] + + return string.format("%s: %s, %d - %d ", day, desc, tmin, tmax) + end + local weather_na_markup = args.weather_na_markup or " N/A " + local followmouse = args.followmouse or false local settings = args.settings or function() end - weather.widget = wibox.widget.textbox('') - weather.icon = wibox.widget.imagebox() + weather.widget = wibox.widget.textbox(weather_na_markup) + weather.icon_path = icons_path .. "na.png" + weather.icon = wibox.widget.imagebox(weather.icon_path) function weather.show(t_out) weather.hide() + + if followmouse then + notification_preset.screen = mouse.screen + end + + if not weather.notification_text then + weather.forecast_update() + end + weather.notification = naughty.notify({ text = weather.notification_text, icon = weather.icon_path, timeout = t_out, - preset = w_notification_preset + preset = notification_preset }) end function weather.hide() - if weather.notification ~= nil then + if weather.notification then naughty.destroy(weather.notification) weather.notification = nil end @@ -69,25 +95,16 @@ local function worker(args) end function weather.forecast_update() - local cmd = string.format(forecast_call, city_id, units, lang, cnt) + local cmd = string.format(forecast_call, city_id, units, lang, cnt, APPID) async.request(cmd, function(f) - j = f:read("*a") - f:close() - weather_now, pos, err = json.decode(j, 1, nil) + local pos, err + weather_now, pos, err = json.decode(f, 1, nil) - if not err and weather_now ~= nil and tonumber(weather_now["cod"]) == 200 then + if not err and weather_now and tonumber(weather_now["cod"]) == 200 then weather.notification_text = '' for i = 1, weather_now["cnt"] do - local f = assert(io.popen(string.format(date_cmd, weather_now["list"][i]["dt"]))) - day = string.gsub(f:read("a"), "\n", "") - f:close() - - tmin = math.floor(weather_now["list"][i]["temp"]["min"]) - tmax = math.floor(weather_now["list"][i]["temp"]["max"]) - desc = weather_now["list"][i]["weather"][1]["description"] - weather.notification_text = weather.notification_text .. - string.format("%s: %s, %d - %d ", day, desc, tmin, tmax) + notification_text_fun(weather_now["list"][i]) if i < weather_now["cnt"] then weather.notification_text = weather.notification_text .. "\n" @@ -98,28 +115,28 @@ local function worker(args) end function weather.update() - local cmd = string.format(current_call, city_id, units, lang) + local cmd = string.format(current_call, city_id, units, lang, APPID) async.request(cmd, function(f) - j = f:read("*a") - f:close() - weather_now, pos, err = json.decode(j, 1, nil) - - if err then - weather.widget.set_text("N/A") - weather.icon:set_image(icons_path .. "na.png") - elseif tonumber(weather_now["cod"]) == 200 then + local pos, err + weather_now, pos, err = json.decode(f, 1, nil) + + if not err and weather_now and tonumber(weather_now["cod"]) == 200 then weather.icon_path = icons_path .. weather_now["weather"][1]["icon"] .. ".png" - weather.icon:set_image(weather.icon_path) widget = weather.widget settings() + else + weather.icon_path = icons_path .. "na.png" + weather.widget:set_markup(weather_na_markup) end + + weather.icon:set_image(weather.icon_path) end) end weather.attach(weather.widget) - newtimer("weather", timeout, weather.update) - newtimer("weather_forecast", timeout, weather.forecast_update) + newtimer("weather-" .. city_id, timeout, weather.update) + newtimer("weather_forecast-" .. city_id, timeout, weather.forecast_update) return setmetatable(weather, { __index = weather.widget }) end