Testing again
This commit is contained in:
parent
d96b3a1258
commit
6ea7b44fbb
1 changed files with 118 additions and 113 deletions
|
|
@ -5,145 +5,150 @@
|
||||||
|
|
||||||
--]]
|
--]]
|
||||||
|
|
||||||
local helpers = require("lina.helpers")
|
local helpers = require("lina.helpers")
|
||||||
local json = require("lina.util").dkjson
|
local json = require("lina.util").dkjson
|
||||||
local focused = require("awful.screen").focused
|
local focused = require("awful.screen").focused
|
||||||
local naughty = require("naughty")
|
local naughty = require("naughty")
|
||||||
local wibox = require("wibox")
|
local wibox = require("wibox")
|
||||||
local math = math
|
local math = math
|
||||||
local os = os
|
local os = os
|
||||||
local string = string
|
local string = string
|
||||||
local type = type
|
local type = type
|
||||||
local tonumber = tonumber
|
local tonumber = tonumber
|
||||||
|
|
||||||
-- OpenWeatherMap
|
-- OpenWeatherMap -- TODO: Change to PirateWeather
|
||||||
-- current weather and X-days forecast
|
-- current weather and X-days forecast
|
||||||
-- lina.widget.weather
|
-- lina.widget.weather
|
||||||
|
|
||||||
local function factory(args)
|
local function factory(args)
|
||||||
args = args or {}
|
args = args or {}
|
||||||
|
|
||||||
local weather = { widget = args.widget or wibox.widget.textbox() }
|
local weather = { widget = args.widget or wibox.widget.textbox() }
|
||||||
local APPID = args.APPID -- mandatory api key
|
local APPID = args.APPID -- mandatory api key
|
||||||
local timeout = args.timeout or 900 -- 15 min
|
local timeout = args.timeout or 900 -- 15 min
|
||||||
local current_call = args.current_call or "curl -s 'https://api.openweathermap.org/data/2.5/weather?lat=%s&lon=%s&APPID=%s&units=%s&lang=%s'"
|
local current_call = args.current_call
|
||||||
local forecast_call = args.forecast_call or "curl -s 'https://api.openweathermap.org/data/2.5/forecast?lat=%s&lon=%s&APPID=%s&cnt=%s&units=%s&lang=%s'"
|
or "curl -s 'https://api.openweathermap.org/data/2.5/weather?lat=%s&lon=%s&APPID=%s&units=%s&lang=%s'"
|
||||||
local lat = args.lat or 0 -- placeholder
|
local forecast_call = args.forecast_call
|
||||||
local lon = args.lon or 0 -- placeholder
|
or "curl -s 'https://api.openweathermap.org/data/2.5/forecast?lat=%s&lon=%s&APPID=%s&cnt=%s&units=%s&lang=%s'"
|
||||||
local units = args.units or "metric"
|
local lat = args.lat or 0 -- placeholder
|
||||||
local lang = args.lang or "en"
|
local lon = args.lon or 0 -- placeholder
|
||||||
local cnt = args.cnt or 5
|
local units = args.units or "metric"
|
||||||
local icons_path = args.icons_path or helpers.icons_dir .. "openweathermap/"
|
local lang = args.lang or "en"
|
||||||
local notification_preset = args.notification_preset or {}
|
local cnt = args.cnt or 5
|
||||||
local notification_text_fun = args.notification_text_fun or
|
local icons_path = args.icons_path or helpers.icons_dir .. "openweathermap/"
|
||||||
function (wn)
|
local notification_preset = args.notification_preset or {}
|
||||||
local day = os.date("%a %d", wn["dt"])
|
local notification_text_fun = args.notification_text_fun
|
||||||
local temp = math.floor(wn["main"]["temp"])
|
or function(wn)
|
||||||
local desc = wn["weather"][1]["description"]
|
local day = os.date("%a %d", wn["dt"])
|
||||||
return string.format("<b>%s</b>: %s, %d ", day, desc, temp)
|
local temp = math.floor(wn["main"]["temp"])
|
||||||
end
|
local desc = wn["weather"][1]["description"]
|
||||||
local weather_na_markup = args.weather_na_markup or " N/A "
|
return string.format("<b>%s</b>: %s, %d ", day, desc, temp)
|
||||||
local followtag = args.followtag or false
|
end
|
||||||
local showpopup = args.showpopup or "on"
|
local weather_na_markup = args.weather_na_markup or " N/A "
|
||||||
local settings = args.settings or function() end
|
local followtag = args.followtag or false
|
||||||
|
local showpopup = args.showpopup or "on"
|
||||||
|
local settings = args.settings or function() end
|
||||||
|
|
||||||
weather.widget:set_markup(weather_na_markup)
|
weather.widget:set_markup(weather_na_markup)
|
||||||
weather.icon_path = icons_path .. "na.png"
|
weather.icon_path = icons_path .. "na.png"
|
||||||
weather.icon = wibox.widget.imagebox(weather.icon_path)
|
weather.icon = wibox.widget.imagebox(weather.icon_path)
|
||||||
|
|
||||||
function weather.show(seconds)
|
function weather.show(seconds)
|
||||||
weather.hide()
|
weather.hide()
|
||||||
|
|
||||||
if followtag then
|
if followtag then
|
||||||
notification_preset.screen = focused()
|
notification_preset.screen = focused()
|
||||||
end
|
end
|
||||||
|
|
||||||
if not weather.notification_text then
|
if not weather.notification_text then
|
||||||
weather.update()
|
weather.update()
|
||||||
weather.forecast_update()
|
weather.forecast_update()
|
||||||
end
|
end
|
||||||
|
|
||||||
weather.notification = naughty.notify {
|
weather.notification = naughty.notify({
|
||||||
preset = notification_preset,
|
preset = notification_preset,
|
||||||
text = weather.notification_text,
|
text = weather.notification_text,
|
||||||
icon = weather.icon_path,
|
icon = weather.icon_path,
|
||||||
timeout = type(seconds) == "number" and seconds or notification_preset.timeout
|
timeout = type(seconds) == "number" and seconds or notification_preset.timeout,
|
||||||
}
|
})
|
||||||
end
|
end
|
||||||
|
|
||||||
function weather.hide()
|
function weather.hide()
|
||||||
if weather.notification then
|
if weather.notification then
|
||||||
naughty.destroy(weather.notification)
|
naughty.destroy(weather.notification)
|
||||||
weather.notification = nil
|
weather.notification = nil
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
function weather.attach(obj)
|
function weather.attach(obj)
|
||||||
obj:connect_signal("mouse::enter", function()
|
obj:connect_signal("mouse::enter", function()
|
||||||
weather.show(0)
|
weather.show(0)
|
||||||
end)
|
end)
|
||||||
obj:connect_signal("mouse::leave", function()
|
obj:connect_signal("mouse::leave", function()
|
||||||
weather.hide()
|
weather.hide()
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
|
|
||||||
function weather.forecast_update()
|
function weather.forecast_update()
|
||||||
local cmd = string.format(forecast_call, lat, lon, APPID, cnt, units, lang)
|
local cmd = string.format(forecast_call, lat, lon, APPID, cnt, units, lang)
|
||||||
|
|
||||||
helpers.async(cmd, function(f)
|
helpers.async(cmd, function(f)
|
||||||
local err
|
local err
|
||||||
weather_now, _, err = json.decode(f, 1, nil)
|
weather_now, _, err = json.decode(f, 1, nil)
|
||||||
|
|
||||||
if not err and type(weather_now) == "table" and tonumber(weather_now["cod"]) == 200 then
|
if not err and type(weather_now) == "table" and tonumber(weather_now["cod"]) == 200 then
|
||||||
weather.notification_text = ""
|
weather.notification_text = ""
|
||||||
for i = 1, weather_now["cnt"], math.floor(weather_now["cnt"] / cnt) do
|
for i = 1, weather_now["cnt"], math.floor(weather_now["cnt"] / cnt) do
|
||||||
weather.notification_text = weather.notification_text ..
|
weather.notification_text = weather.notification_text
|
||||||
notification_text_fun(weather_now["list"][i])
|
.. notification_text_fun(weather_now["list"][i])
|
||||||
if i < weather_now["cnt"] then
|
if i < weather_now["cnt"] then
|
||||||
weather.notification_text = weather.notification_text .. "\n"
|
weather.notification_text = weather.notification_text .. "\n"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
|
|
||||||
function weather.update()
|
function weather.update()
|
||||||
local cmd = string.format(current_call, lat, lon, APPID, units, lang)
|
local cmd = string.format(current_call, lat, lon, APPID, units, lang)
|
||||||
|
|
||||||
helpers.async(cmd, function(f)
|
helpers.async(cmd, function(f)
|
||||||
local err
|
local err
|
||||||
weather_now, _, err = json.decode(f, 1, nil)
|
weather_now, _, err = json.decode(f, 1, nil)
|
||||||
|
|
||||||
if not err and type(weather_now) == "table" and tonumber(weather_now["cod"]) == 200 then
|
if not err and type(weather_now) == "table" and tonumber(weather_now["cod"]) == 200 then
|
||||||
local sunrise = tonumber(weather_now["sys"]["sunrise"])
|
local sunrise = tonumber(weather_now["sys"]["sunrise"])
|
||||||
local sunset = tonumber(weather_now["sys"]["sunset"])
|
local sunset = tonumber(weather_now["sys"]["sunset"])
|
||||||
local icon = weather_now["weather"][1]["icon"]
|
local icon = weather_now["weather"][1]["icon"]
|
||||||
local loc_now = os.time()
|
local loc_now = os.time()
|
||||||
|
|
||||||
if sunrise <= loc_now and loc_now <= sunset then
|
if sunrise <= loc_now and loc_now <= sunset then
|
||||||
icon = string.gsub(icon, "n", "d")
|
icon = string.gsub(icon, "n", "d")
|
||||||
else
|
else
|
||||||
icon = string.gsub(icon, "d", "n")
|
icon = string.gsub(icon, "d", "n")
|
||||||
end
|
end
|
||||||
|
|
||||||
weather.icon_path = icons_path .. icon .. ".png"
|
weather.icon_path = icons_path .. icon .. ".png"
|
||||||
widget = weather.widget
|
widget = weather.widget
|
||||||
settings()
|
settings()
|
||||||
else
|
else
|
||||||
weather.icon_path = icons_path .. "na.png"
|
weather.icon_path = icons_path .. "na.png"
|
||||||
weather.widget:set_markup(weather_na_markup)
|
weather.widget:set_markup(weather_na_markup)
|
||||||
end
|
end
|
||||||
|
|
||||||
weather.icon:set_image(weather.icon_path)
|
weather.icon:set_image(weather.icon_path)
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
|
|
||||||
if showpopup == "on" then weather.attach(weather.widget) end
|
if showpopup == "on" then
|
||||||
|
weather.attach(weather.widget)
|
||||||
|
end
|
||||||
|
|
||||||
weather.timer = helpers.newtimer("weather-" .. lat .. ":" .. lon, timeout, weather.update, false, true)
|
weather.timer = helpers.newtimer("weather-" .. lat .. ":" .. lon, timeout, weather.update, false, true)
|
||||||
weather.timer_forecast = helpers.newtimer("weather_forecast-" .. lat .. ":" .. lon, timeout, weather.forecast_update, false, true)
|
weather.timer_forecast =
|
||||||
|
helpers.newtimer("weather_forecast-" .. lat .. ":" .. lon, timeout, weather.forecast_update, false, true)
|
||||||
|
|
||||||
return weather
|
return weather
|
||||||
end
|
end
|
||||||
|
|
||||||
return factory
|
return factory
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue