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

Merge branch 'master' of https://github.com/copycat-killer/lain

This commit is contained in:
aajjbb 2015-08-29 16:31:52 -03:00
parent 57490f19d6 6aca9e1730
commit edc6e0013e
2 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
widgets/weather.lua
View File

@ -41,6 +41,10 @@ local function worker(args)
local date_cmd = args.date_cmd or "date -u -d @%d +'%%a %%d'" local date_cmd = args.date_cmd or "date -u -d @%d +'%%a %%d'"
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
function (day, desc, tmin, tmax)
return string.format("<b>%s</b>: %s, %d - %d ", day, desc, tmin, tmax)
end
local followmouse = args.followmouse or false local followmouse = args.followmouse or false
local settings = args.settings or function() end local settings = args.settings or function() end
@ -81,19 +85,20 @@ local function worker(args)
function weather.forecast_update() 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)
async.request(cmd, function(f) async.request(cmd, function(f)
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 ~= nil 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
day = string.gsub(read_pipe(string.format(date_cmd, weather_now["list"][i]["dt"])), "\n", "") local day = string.gsub(read_pipe(string.format(date_cmd, weather_now["list"][i]["dt"])), "\n", "")
tmin = math.floor(weather_now["list"][i]["temp"]["min"]) local tmin = math.floor(weather_now["list"][i]["temp"]["min"])
tmax = math.floor(weather_now["list"][i]["temp"]["max"]) local tmax = math.floor(weather_now["list"][i]["temp"]["max"])
desc = weather_now["list"][i]["weather"][1]["description"] local desc = weather_now["list"][i]["weather"][1]["description"]
weather.notification_text = weather.notification_text .. weather.notification_text = weather.notification_text ..
string.format("<b>%s</b>: %s, %d - %d ", day, desc, tmin, tmax) notification_text_fun(day, desc, tmin, tmax)
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"
@ -109,6 +114,7 @@ local function worker(args)
function weather.update() function weather.update()
local cmd = string.format(current_call, city_id, units, lang) local cmd = string.format(current_call, city_id, units, lang)
async.request(cmd, function(f) async.request(cmd, function(f)
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 ~= nil and tonumber(weather_now["cod"]) == 200 then
@ -126,7 +132,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)
return setmetatable(weather, { __index = weather.widget }) return setmetatable(weather, { __index = weather.widget })
end end

2
wiki

@ -1 +1 @@
Subproject commit e21f7ddbdd05019501136a7cca1ac6c897eae2ce Subproject commit a24a74924b80b7293d0f4171a855f1eb23ab90cc