Skip to content

Adding 'showCurrentWeatherNotification' args option to show current w… #495

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Adding 'showCurrentWeatherNotification' args option to show current w… #495

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c28071d
Converting volume level to number in ALSA widget
Feb 25, 2021
da418f2
Merge pull request #489 from bzgec/PR/ALSA_fix
lcpz Mar 15, 2021
c794d33
Adding 'showCurrentWeatherNotification' args option to show current w…
Mar 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion widget/alsa.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ local function factory(args)
helpers.async(format_cmd, function(mixer)
local l,s = string.match(mixer, "([%d]+)%%.*%[([%l]*)")
if alsa.last.level ~= l or alsa.last.status ~= s then
volume_now = { level = l, status = s }
volume_now = { level = tonumber(l), status = s }
widget = alsa.widget
settings()
alsa.last = volume_now
Expand Down
26 changes: 25 additions & 1 deletion widget/weather.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@ local tonumber = tonumber
local function factory(args)
args = args or {}

local weather = { widget = args.widget or wibox.widget.textbox() }
local weather = { widget = args.widget or wibox.widget.textbox(),
currentWeather = {},
}
local APPID = args.APPID -- mandatory
local timeout = args.timeout or 60 * 15 -- 15 min
local current_call = args.current_call or "curl -s 'https://api.openweathermap.org/data/2.5/weather?id=%s&units=%s&lang=%s&APPID=%s'"
Expand All @@ -42,9 +44,21 @@ local function factory(args)
local desc = wn["weather"][1]["description"]
return string.format("<b>%s</b>: %s, %d - %d ", day, desc, tmin, tmax)
end
local notification_text_currentWeather = args.notification_text_currentWeather or
function (wn)
return string.format(
"<b>%s</b>\n- %s\n- Temp: %0.1f°C\n- Feels like: %0.1f°C\n- Pressure: %d\n- Humidity: %d%%\n",
wn["name"],
wn["weather"][1]["description"],
wn["main"]["temp"],
wn["main"]["feels_like"],
wn["main"]["pressure"],
wn["main"]["humidity"])
end
local weather_na_markup = args.weather_na_markup or " N/A "
local followtag = args.followtag or false
local showpopup = args.showpopup or "on"
local showCurrentWeatherNotification = args.showCurrentWeatherNotification or "off"
local settings = args.settings or function() end

weather.widget:set_markup(weather_na_markup)
Expand Down Expand Up @@ -95,6 +109,12 @@ local function factory(args)

if not err and type(weather_now) == "table" and tonumber(weather_now["cod"]) == 200 then
weather.notification_text = ""

if showCurrentWeatherNotification == "on" then
weather.notification_text = weather.notification_text ..
notification_text_currentWeather(weather.currentWeather)
end

for i = 1, weather_now["cnt"], weather_now["cnt"]//cnt do
weather.notification_text = weather.notification_text ..
notification_text_fun(weather_now["list"][i])
Expand Down Expand Up @@ -126,6 +146,10 @@ local function factory(args)

weather.icon_path = icons_path .. icon .. ".png"
widget = weather.widget

-- Store current weather for notification popup
weather.currentWeather = weather_now

settings()
else
weather.icon_path = icons_path .. "na.png"
Expand Down