awesomewm-mirrors
/
lain
mirror of https://github.com/lcpz/lain.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

modified: widgets/weather.lua - added current weather description to notification

This commit is contained in:
Aleksandr Beliaev 2016-05-27 14:52:18 +12:00
parent afd51e20bb
commit e6e0889fb2
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
widgets/weather.lua
View File

@ -70,8 +70,12 @@ local function worker(args)
weather.forecast_update() weather.forecast_update()
end end
if not weather.current_text then
weather.update()
end
weather.notification = naughty.notify({ weather.notification = naughty.notify({
text = weather.notification_text, text = weather.current_text .. weather.notification_text,
icon = weather.icon_path, icon = weather.icon_path,
timeout = t_out, timeout = t_out,
preset = notification_preset preset = notification_preset
@ -119,7 +123,7 @@ local function worker(args)
async.request(cmd, function(f) async.request(cmd, function(f)
local pos, err, sunrise, sunset, current_dt, datetime, icon local pos, err, sunrise, sunset, current_dt, datetime, icon
weather_now, pos, err = json.decode(f, 1, nil) weather_now, pos, err = json.decode(f, 1, nil)
weather.current_text=''
if not err and weather_now and tonumber(weather_now["cod"]) == 200 then if not err and weather_now and tonumber(weather_now["cod"]) == 200 then
current_dt = os.time() current_dt = os.time()
sunrise = weather_now["sys"]["sunrise"] sunrise = weather_now["sys"]["sunrise"]
@ -132,6 +136,7 @@ local function worker(args)
icon = weather_now["weather"][1]["icon"] icon = weather_now["weather"][1]["icon"]
weather.icon_path = icons_path .. icon:sub(1,2) .. datetime .. ".png" weather.icon_path = icons_path .. icon:sub(1,2) .. datetime .. ".png"
widget = weather.widget widget = weather.widget
weather.current_text = "Now:" .. weather_now["weather"][1]["description"] .. "\n"
settings() settings()
else else
weather.icon_path = icons_path .. "na.png" weather.icon_path = icons_path .. "na.png"