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 - seems fixed datetime calculation

This commit is contained in:
Aleksandr Beliaev 2016-05-31 14:05:44 +12:00
parent 321274e332
commit 40d3c9e33a
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
widgets/weather.lua
View File

@ -39,6 +39,7 @@ local function worker(args)
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 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 city_id = args.city_id or 0 -- placeholder
local utc = args.utc or 0 local utc = args.utc or 0
local units = args.units or "metric" local units = args.units or "metric"
local lang = args.lang or "en" local lang = args.lang or "en"
local cnt = args.cnt or 5 local cnt = args.cnt or 5
@ -120,19 +121,31 @@ local function worker(args)
function weather.update() function weather.update()
local cmd = string.format(current_call, city_id, units, lang, APPID) local cmd = string.format(current_call, city_id, units, lang, APPID)
local utc_midnight_cmd = ("date -u -d 'today 00:00:00' +'%%s'")
async.request(cmd, function(f) async.request(cmd, function(f)
local pos, err, icon local pos, err, icon
weather_now, pos, err = json.decode(f, 1, nil) weather_now, pos, err = json.decode(f, 1, nil)
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
-- weather icon based on localtime -- weather icon based on localtime
now = os.time() now = os.time()
utc_midnight = string.gsub(read_pipe(string.format(utc_midnight_cmd)), "\n", "")
if utc > 0 then
if (now - (utc * 3600)) >= tonumber(utc_midnight) then
now = now - 86400
end
else
if (now - (utc * 3600)) <= tonumber(utc_midnight) then
now = now + 86400
end
end
sunrise = tonumber(weather_now["sys"]["sunrise"]) sunrise = tonumber(weather_now["sys"]["sunrise"])
sunset = tonumber(weather_now["sys"]["sunset"]) sunset = tonumber(weather_now["sys"]["sunset"])
icon = weather_now["weather"][1]["icon"] icon = weather_now["weather"][1]["icon"]
if sunrise <= (now-86400) then now = now - 86400 end
if sunrise <= now and now <= sunset then if sunrise <= now and now <= sunset then
icon = string.gsub(icon, "n", "d") icon = string.gsub(icon, "n", "d")
else else