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

modified: widgets/weather.lua - test if the tomorrow came

Browse source
This commit is contained in:
Aleksandr Beliaev 2016-05-30 12:50:42 +12:00
parent 053ce982b8
commit 321274e332
1 changed files with 6 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
widgets/weather.lua
View file

@ -73,8 +73,9 @@ local function worker(args)
weather.forecast_update() weather.forecast_update()
end end
weather.notification = naughty.notify({ weather.notification = naughty.notify({
text = weather.current_text .. weather.notification_text, text = weather.notification_text,
icon = weather.icon_path, icon = weather.icon_path,
timeout = t_out, timeout = t_out,
preset = notification_preset preset = notification_preset
@ -122,39 +123,25 @@ local function worker(args)
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)
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
<<<<<<< HEAD
-- weather icon based on localtime -- weather icon based on localtime
now = os.time() - (utc * 3600) now = os.time()
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")
=======
current_dt = os.time()
sunrise = weather_now["sys"]["sunrise"]
sunset = weather_now["sys"]["sunset"]
if current_dt> sunrise and current_dt> sunset then current_dt = current_dt - 86400 end
if current_dt > sunrise and current_dt < sunset then
datetime="d"
>>>>>>> e3a5dd623700b2cad423c8179141124e6e9b9027
else else
icon = string.gsub(icon, "d", "n") icon = string.gsub(icon, "d", "n")
end end
<<<<<<< HEAD
weather.icon_path = icons_path .. icon .. ".png" weather.icon_path = icons_path .. icon .. ".png"
=======
-- error("dt sr:" .. sunrise .. "ss: " .. sunset .. "dt: " .. current_dt .. "d/n: " .. datetime .. "hehe")
icon = weather_now["weather"][1]["icon"]
weather.icon_path = icons_path .. icon:sub(1,2) .. datetime .. ".png"
>>>>>>> e3a5dd623700b2cad423c8179141124e6e9b9027
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"