adam/lina
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

weather: make notification function general

Browse source
This commit is contained in:
copycat-killer 2016-03-30 13:04:26 +02:00
parent d1b36bb53c
commit fc7403534f
1 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
widgets/weather.lua
View file

@ -43,7 +43,12 @@ local function worker(args)
local icons_path = args.icons_path or lain_icons .. "openweathermap/" local icons_path = args.icons_path or lain_icons .. "openweathermap/"
local notification_preset = args.notification_preset or {} local notification_preset = args.notification_preset or {}
local notification_text_fun = args.notification_text_fun or local notification_text_fun = args.notification_text_fun or
function (day, desc, tmin, tmax) 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("<b>%s</b>: %s, %d - %d ", day, desc, tmin, tmax) return string.format("<b>%s</b>: %s, %d - %d ", day, desc, tmin, tmax)
end end
local weather_na_markup = args.weather_na_markup or " N/A " local weather_na_markup = args.weather_na_markup or " N/A "
@ -62,8 +67,7 @@ local function worker(args)
end end
weather.notification = naughty.notify({ weather.notification = naughty.notify({
text = weather.notification_text text = weather.notification_text,
or "Waiting for the server to respond...",
icon = weather.icon_path, icon = weather.icon_path,
timeout = t_out, timeout = t_out,
preset = notification_preset preset = notification_preset
@ -71,7 +75,7 @@ local function worker(args)
end end
function weather.hide() function weather.hide()
if weather.notification ~= nil then if weather.notification then
naughty.destroy(weather.notification) naughty.destroy(weather.notification)
weather.notification = nil weather.notification = nil
end end
@ -92,24 +96,18 @@ local function worker(args)
local pos, err local pos, err
weather_now, pos, err = json.decode(f, 1, nil) 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 = '' weather.notification_text = ''
for i = 1, weather_now["cnt"] do for i = 1, weather_now["cnt"] do
local day = string.gsub(read_pipe(string.format(date_cmd, weather_now["list"][i]["dt"])), "\n", "")
local tmin = math.floor(weather_now["list"][i]["temp"]["min"])
local tmax = math.floor(weather_now["list"][i]["temp"]["max"])
local desc = weather_now["list"][i]["weather"][1]["description"]
weather.notification_text = weather.notification_text .. weather.notification_text = weather.notification_text ..
notification_text_fun(day, desc, tmin, tmax) notification_text_fun(weather_now["list"][i])
if i < weather_now["cnt"] then if i < weather_now["cnt"] then
weather.notification_text = weather.notification_text .. "\n" weather.notification_text = weather.notification_text .. "\n"
end end
end end
else else
weather.notification_text = "API/connection error or bad/not set city ID" weather.notification_text = "API/connection error or invalid city ID"
end end
end) end)
end end
@ -136,7 +134,7 @@ local function worker(args)
weather.attach(weather.widget) weather.attach(weather.widget)
newtimer("weather-" .. city_id, timeout, weather.update) newtimer("weather-" .. city_id, timeout, weather.update)
newtimer("weather_forecast-" .. city_id, timeout, weather.forecast_update) newtimer("weather_forecast-" .. city_id, timeout, weather.forecast_update, nil)
return setmetatable(weather, { __index = weather.widget }) return setmetatable(weather, { __index = weather.widget })
end end