X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/6aca9e17306d260a4742318d994aee5b181e7aee..053ce982b8fc2f4ec3a4865cb41204331faab6eb:/widgets/weather.lua?ds=inline
diff --git a/widgets/weather.lua b/widgets/weather.lua
index de3163c..c684fe2 100644
--- a/widgets/weather.lua
+++ b/widgets/weather.lua
@@ -18,9 +18,11 @@ local wibox = require("wibox")
local math = { floor = math.floor }
local mouse = mouse
+local os = { time = os.time }
local string = { format = string.format,
gsub = string.gsub }
+local tonumber = tonumber
local setmetatable = setmetatable
-- OpenWeatherMap
@@ -30,26 +32,35 @@ local setmetatable = setmetatable
local function worker(args)
local weather = {}
local args = args or {}
+ local APPID = args.APPID or "3e321f9414eaedbfab34983bda77a66e" -- lain default
local timeout = args.timeout or 900 -- 15 min
local timeout_forecast = args.timeout or 86400 -- 24 hrs
- local current_call = "curl -s 'http://api.openweathermap.org/data/2.5/weather?id=%s&units=%s&lang=%s'"
- local forecast_call = "curl -s 'http://api.openweathermap.org/data/2.5/forecast/daily?id=%s&units=%s&lang=%s&cnt=%s'"
+ local current_call = args.current_call or "curl -s 'http://api.openweathermap.org/data/2.5/weather?id=%s&units=%s&lang=%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 utc = args.utc or 0
local units = args.units or "metric"
local lang = args.lang or "en"
- local cnt = args.cnt or 7
+ local cnt = args.cnt or 5
local date_cmd = args.date_cmd or "date -u -d @%d +'%%a %%d'"
local icons_path = args.icons_path or lain_icons .. "openweathermap/"
local notification_preset = args.notification_preset or {}
local notification_text_fun = args.notification_text_fun or
- function (day, desc, tmin, tmax)
- return string.format("%s: %s, %d - %d ", day, desc, tmin, tmax)
+ function (wn)
+ local day = string.gsub(read_pipe(string.format(date_cmd, wn["dt"])), "\n", "")
+ local tmin = math.floor(wn["temp"]["min"])
+ local tmax = math.floor(wn["temp"]["max"])
+ local desc = wn["weather"][1]["description"]
+
+ return string.format("%s: %s, %d - %d ", day, desc, tmin, tmax)
end
+ local weather_na_markup = args.weather_na_markup or " N/A "
local followmouse = args.followmouse or false
local settings = args.settings or function() end
- weather.widget = wibox.widget.textbox('')
- weather.icon = wibox.widget.imagebox()
+ weather.widget = wibox.widget.textbox(weather_na_markup)
+ weather.icon_path = icons_path .. "na.png"
+ weather.icon = wibox.widget.imagebox(weather.icon_path)
function weather.show(t_out)
weather.hide()
@@ -58,8 +69,12 @@ local function worker(args)
notification_preset.screen = mouse.screen
end
+ if not weather.notification_text then
+ weather.forecast_update()
+ end
+
weather.notification = naughty.notify({
- text = weather.notification_text,
+ text = weather.current_text .. weather.notification_text,
icon = weather.icon_path,
timeout = t_out,
preset = notification_preset
@@ -67,7 +82,7 @@ local function worker(args)
end
function weather.hide()
- if weather.notification ~= nil then
+ if weather.notification then
naughty.destroy(weather.notification)
weather.notification = nil
end
@@ -83,49 +98,70 @@ local function worker(args)
end
function weather.forecast_update()
- local cmd = string.format(forecast_call, city_id, units, lang, cnt)
+ local cmd = string.format(forecast_call, city_id, units, lang, cnt, APPID)
async.request(cmd, function(f)
local pos, err
weather_now, pos, err = json.decode(f, 1, nil)
- if not err and weather_now ~= nil and tonumber(weather_now["cod"]) == 200 then
+ if not err and weather_now and tonumber(weather_now["cod"]) == 200 then
weather.notification_text = ''
for i = 1, weather_now["cnt"] do
- local day = string.gsub(read_pipe(string.format(date_cmd, weather_now["list"][i]["dt"])), "\n", "")
-
- local tmin = math.floor(weather_now["list"][i]["temp"]["min"])
- local tmax = math.floor(weather_now["list"][i]["temp"]["max"])
- local desc = weather_now["list"][i]["weather"][1]["description"]
-
weather.notification_text = weather.notification_text ..
- notification_text_fun(day, desc, tmin, tmax)
+ notification_text_fun(weather_now["list"][i])
if i < weather_now["cnt"] then
weather.notification_text = weather.notification_text .. "\n"
end
end
- else
- weather.icon_path = icons_path .. "na.png"
- weather.notification_text = "API/connection error or bad/not set city ID"
end
end)
end
function weather.update()
- local cmd = string.format(current_call, city_id, units, lang)
+ local cmd = string.format(current_call, city_id, units, lang, APPID)
async.request(cmd, function(f)
- local pos, err
+ 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)
+ sunrise = tonumber(weather_now["sys"]["sunrise"])
+ sunset = tonumber(weather_now["sys"]["sunset"])
+ icon = weather_now["weather"][1]["icon"]
+
+ 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
- if not err and weather_now ~= nil and tonumber(weather_now["cod"]) == 200 then
- weather.icon_path = icons_path .. weather_now["weather"][1]["icon"] .. ".png"
- weather.icon:set_image(weather.icon_path)
+ 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.widget._layout.text = " N/A " -- tries to avoid textbox bugs
- weather.icon:set_image(icons_path .. "na.png")
+ weather.icon_path = icons_path .. "na.png"
+ weather.widget:set_markup(weather_na_markup)
end
+
+ weather.icon:set_image(weather.icon_path)
end)
end