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 github.com:trap000d/lain 

modified:   widgets/weather.lua
This commit is contained in:
Aleksandr Beliaev 2016-05-30 11:50:03 +12:00
parent 5e28dd3f9f e3a5dd6237
commit 053ce982b8
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
widgets/weather.lua
View File

@ -124,6 +124,7 @@ local function worker(args)
weather_now, pos, err = json.decode(f, 1, nil) weather_now, pos, err = json.decode(f, 1, nil)
weather.current_text='' 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() - (utc * 3600)
sunrise = tonumber(weather_now["sys"]["sunrise"]) sunrise = tonumber(weather_now["sys"]["sunrise"])
@ -132,12 +133,26 @@ local function worker(args)
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" weather.current_text = "Now:" .. weather_now["weather"][1]["description"] .. "\n"
settings() settings()