X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/52deb6911957f840a0191f73c8a9626bd9ff5086..1738f98c04158ecd7099ad15e97702818d793b2c:/widgets/weather.lua?ds=inline
diff --git a/widgets/weather.lua b/widgets/weather.lua
index 741c9dc..173601a 100644
--- a/widgets/weather.lua
+++ b/widgets/weather.lua
@@ -7,9 +7,12 @@
--]]
local newtimer = require("lain.helpers").newtimer
+local read_pipe = require("lain.helpers").read_pipe
+
local async = require("lain.asyncshell")
local json = require("lain.util").dkjson
local lain_icons = require("lain.helpers").icons_dir
+
local naughty = require("naughty")
local wibox = require("wibox")
@@ -25,24 +28,31 @@ local setmetatable = setmetatable
-- lain.widgets.weather
local function worker(args)
- local weather = {}
- local args = args or {}
- 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 city_id = args.city_id or 0 -- placeholder
- local units = args.units or "metric"
- local lang = args.lang or "en"
- local cnt = args.cnt or 7
- 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 followmouse = args.followmouse or false
- local settings = args.settings or function() end
-
- weather.widget = wibox.widget.textbox('')
- weather.icon = wibox.widget.imagebox()
+ 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&APPID=%s'"
+ local forecast_call = "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 units = args.units or "metric"
+ local lang = args.lang or "en"
+ local cnt = args.cnt or 7
+ 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)
+ 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_na_markup)
+ weather.icon_path = icons_path .. "na.png"
+ weather.icon = wibox.widget.imagebox(weather.icon_path)
function weather.show(t_out)
weather.hide()
@@ -52,7 +62,8 @@ local function worker(args)
end
weather.notification = naughty.notify({
- text = weather.notification_text,
+ text = weather.notification_text
+ or "Waiting for the server to respond...",
icon = weather.icon_path,
timeout = t_out,
preset = notification_preset
@@ -76,60 +87,56 @@ 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)
- j = f:read("*all")
- f:close()
- weather_now, pos, err = json.decode(j, 1, nil)
+ 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
weather.notification_text = ''
for i = 1, weather_now["cnt"] do
- local f = assert(io.popen(string.format(date_cmd, weather_now["list"][i]["dt"])))
- day = string.gsub(f:read("*all"), "\n", "")
- f:close()
+ local day = string.gsub(read_pipe(string.format(date_cmd, weather_now["list"][i]["dt"])), "\n", "")
- tmin = math.floor(weather_now["list"][i]["temp"]["min"])
- tmax = math.floor(weather_now["list"][i]["temp"]["max"])
- desc = weather_now["list"][i]["weather"][1]["description"]
+ 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 ..
- string.format("%s: %s, %d - %d ", day, desc, tmin, tmax)
+ notification_text_fun(day, desc, tmin, tmax)
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)
- j = f:read("*all")
- f:close()
- weather_now, pos, err = json.decode(j, 1, nil)
+ 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
weather.icon_path = icons_path .. weather_now["weather"][1]["icon"] .. ".png"
- weather.icon:set_image(weather.icon_path)
widget = weather.widget
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
weather.attach(weather.widget)
newtimer("weather-" .. city_id, timeout, weather.update)
- newtimer("weather_forecast" .. city_id, timeout, weather.forecast_update)
+ newtimer("weather_forecast-" .. city_id, timeout, weather.forecast_update)
return setmetatable(weather, { __index = weather.widget })
end