local os = { time = os.time }
local string = { format = string.format,
gsub = string.gsub }
-
+local naughty = require("naughty")
local tonumber = tonumber
local setmetatable = setmetatable
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
function weather.update()
local cmd = string.format(current_call, city_id, units, lang, APPID)
+ local utc_midnight_cmd = string.format("date -u -d 'today 00:00:00' +'%%s'")
+ local local_midnight_cmd = string.format("date -d 'today 00:00:00' +'%%s'")
+
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
-- weather icon based on localtime
- now = os.time() - (utc * 3600)
- sunrise = tonumber(weather_now["sys"]["sunrise"])
- sunset = tonumber(weather_now["sys"]["sunset"])
- icon = weather_now["weather"][1]["icon"]
+ now = os.time()
+ local utc_midnight = string.gsub(read_pipe(utc_midnight_cmd), "\n", "")
+ local local_midnight = string.gsub(read_pipe(local_midnight_cmd), "\n", "")
+
+ if utc > 0 then -- we are to the East from GMT
+ if tonumber(local_midnight) >= tonumber(utc_midnight) then -- we are 1 day after the GMT, so have to return 1 day back
+ now = now - 86400
+ end
+ end
+
+ if utc < 0 then -- we are to the West from GMT
+ if tonumber(local_midnight) <= tonumber(utc_midnight) then -- we are 1 day before the GMT
+ now = now + 86400
+ end
+ end
+ -- if utc==0 leave it as is
+ local sunrise = tonumber(weather_now["sys"]["sunrise"])
+ local sunset = tonumber(weather_now["sys"]["sunset"])
+ local icon = weather_now["weather"][1]["icon"]
if sunrise <= now and now <= sunset then
icon = string.gsub(icon, "n", "d")
weather.icon_path = icons_path .. icon .. ".png"
widget = weather.widget
- weather.current_text = "Now:" .. weather_now["weather"][1]["description"] .. "\n"
settings()
else
weather.icon_path = icons_path .. "na.png"