From: Aleksandr Beliaev Date: Mon, 30 May 2016 00:50:42 +0000 (+1200) Subject: modified: widgets/weather.lua - test if the tomorrow came X-Git-Url: https://git.madduck.net/etc/awesome.git/commitdiff_plain/321274e33237aefa896eabcf6fb0b2c439cd2bdb?ds=inline;hp=-c modified: widgets/weather.lua - test if the tomorrow came --- 321274e33237aefa896eabcf6fb0b2c439cd2bdb diff --git a/widgets/weather.lua b/widgets/weather.lua index c684fe2..3512f22 100644 --- a/widgets/weather.lua +++ b/widgets/weather.lua @@ -73,8 +73,9 @@ local function worker(args) weather.forecast_update() end + weather.notification = naughty.notify({ - text = weather.current_text .. weather.notification_text, + text = weather.notification_text, icon = weather.icon_path, timeout = t_out, preset = notification_preset @@ -122,39 +123,25 @@ local function worker(args) async.request(cmd, function(f) local pos, err, icon 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 -<<<<<<< HEAD -- weather icon based on localtime - now = os.time() - (utc * 3600) + now = os.time() sunrise = tonumber(weather_now["sys"]["sunrise"]) sunset = tonumber(weather_now["sys"]["sunset"]) icon = weather_now["weather"][1]["icon"] + if sunrise <= (now-86400) then now = now - 86400 end + if sunrise <= now and now <= sunset then 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 icon = string.gsub(icon, "d", "n") end -<<<<<<< HEAD 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 - weather.current_text = "Now:" .. weather_now["weather"][1]["description"] .. "\n" settings() else weather.icon_path = icons_path .. "na.png"