awesomewm-mirrors
/
awesome-wm-widgets
mirror of https://github.com/streetturtle/awesome-wm-widgets.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #357 from HamishFleming/fix/#242/apt-widget 

fix(apt-widget): Fixed nil value (buttons) -Also replaces awful.util with gears
This commit is contained in:
streetturtle 2023-07-16 20:51:38 -04:00 committed by GitHub
parent b0f7173d99 2f79c7bf35
commit cd0e1a8a3a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 311 additions and 290 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

203
apt-widget/apt-widget.lua
View File

@ -15,21 +15,28 @@ local naughty = require("naughty")
local gears = require("gears")
local beautiful = require("beautiful")
--- Utility Function to handle alternative paths
local function script_path()
local str = debug.getinfo(2, "S").source:sub(2)
return str:match("(.*/)")
end
local HOME_DIR = os.getenv("HOME")
local WIDGET_DIR = HOME_DIR .. '/.config/awesome/awesome-wm-widgets/apt-widget'
local ICONS_DIR = WIDGET_DIR .. '/icons/'
local WIDGET_DIR = script_path()
local ICONS_DIR = WIDGET_DIR .. "/icons/"
local LIST_PACKAGES = [[sh -c "LC_ALL=c apt list --upgradable 2>/dev/null"]]
--- Utility function to show warning messages
local function show_warning(message)
naughty.notify{
naughty.notify({
preset = naughty.config.presets.critical,
title = 'Docker Widget',
text = message}
title = "Docker Widget",
text = message,
})
end
local wibox_popup = wibox {
local wibox_popup = wibox({
ontop = true,
visible = false,
shape = function(cr, width, height)
@ -40,44 +47,53 @@ local wibox_popup = wibox {
max_widget_size = 500,
height = 500,
width = 300,
}
})
local apt_widget = wibox.widget {
local apt_widget = wibox.widget({
{
{
id = 'icon',
widget = wibox.widget.imagebox
id = "icon",
widget = wibox.widget.imagebox,
},
margins = 4,
layout = wibox.container.margin
layout = wibox.container.margin,
},
layout = wibox.layout.fixed.horizontal,
set_icon = function(self, new_icon)
self:get_children_by_id("icon")[1].image = new_icon
end
}
end,
})
local apt_widget_button = wibox.widget({
{
apt_widget,
widget = wibox.container.margin,
},
widget = clickable_container,
})
--- Parses the line and creates the package table out of it
--- yaru-theme-sound/focal-updates,focal-updates 20.04.10.1 all [upgradable from: 20.04.8]
local parse_package = function(line)
local name,_,nv,type,ov = line:match('(.*)%/(.*)%s(.*)%s(.*)%s%[upgradable from: (.*)]')
local name, _, nv, type, ov = line:match("(.*)%/(.*)%s(.*)%s(.*)%s%[upgradable from: (.*)]")
if name == nil then return nil end
if name == nil then
return nil
end
local package = {
name = name,
new_version = nv,
type = type,
old_version = ov
old_version = ov,
}
return package
end
local function worker(user_args)
local args = user_args or {}
local icon = args.icon or ICONS_DIR .. 'white-black.svg'
local icon = args.icon or ICONS_DIR .. "white-black.svg"
apt_widget:set_icon(icon)
@ -86,10 +102,9 @@ local function worker(user_args)
local carousel = false
local function rebuild_widget(containers, errors, _, _)
local to_update = {}
if errors ~= '' then
if errors ~= "" then
show_warning(errors)
return
end
@ -127,45 +142,44 @@ local function worker(user_args)
local package = parse_package(line)
if package ~= nil then
local refresh_button = wibox.widget {
local refresh_button = wibox.widget({
{
{
id = 'icon',
image = ICONS_DIR .. 'refresh-cw.svg',
id = "icon",
image = ICONS_DIR .. "refresh-cw.svg",
resize = false,
widget = wibox.widget.imagebox
widget = wibox.widget.imagebox,
},
margins = 4,
widget = wibox.container.margin
widget = wibox.container.margin,
},
shape = gears.shape.circle,
opacity = 0.5,
widget = wibox.container.background
}
widget = wibox.container.background,
})
local old_cursor, old_wibox
refresh_button:connect_signal("mouse::enter", function(c)
c:set_opacity(1)
c:emit_signal('widget::redraw_needed')
c:emit_signal("widget::redraw_needed")
local wb = mouse.current_wibox
old_cursor, old_wibox = wb.cursor, wb
wb.cursor = "hand1"
end)
refresh_button:connect_signal("mouse::leave", function(c)
c:set_opacity(0.5)
c:emit_signal('widget::redraw_needed')
c:emit_signal("widget::redraw_needed")
if old_wibox then
old_wibox.cursor = old_cursor
old_wibox = nil
end
end)
local row = wibox.widget {
local row = wibox.widget({
{
{
{
{
id = 'checkbox',
id = "checkbox",
checked = false,
color = beautiful.bg_normal,
paddings = 2,
@ -175,38 +189,38 @@ local function worker(user_args)
check_color = beautiful.fg_urgent,
border_color = beautiful.bg_urgent,
border_width = 1,
widget = wibox.widget.checkbox
widget = wibox.widget.checkbox,
},
valign = 'center',
valign = "center",
layout = wibox.container.place,
},
{
{
id = 'name',
markup = '<b>' .. package['name'] .. '</b>',
widget = wibox.widget.textbox
id = "name",
markup = "<b>" .. package["name"] .. "</b>",
widget = wibox.widget.textbox,
},
halign = 'left',
layout = wibox.container.place
halign = "left",
layout = wibox.container.place,
},
{
refresh_button,
halign = 'right',
valign = 'center',
halign = "right",
valign = "center",
fill_horizontal = true,
layout = wibox.container.place,
},
spacing = 8,
layout = wibox.layout.fixed.horizontal
layout = wibox.layout.fixed.horizontal,
},
margins = 8,
layout = wibox.container.margin
layout = wibox.container.margin,
},
id = 'row',
id = "row",
bg = beautiful.bg_normal,
widget = wibox.container.background,
click = function(self, checked)
local a = self:get_children_by_id('checkbox')[1]
local a = self:get_children_by_id("checkbox")[1]
if checked == nil then
a:set_checked(not a.checked)
else
@ -214,24 +228,24 @@ local function worker(user_args)
end
if a.checked then
to_update[package['name']] = self
to_update[ package["name"] ] = self
else
to_update[package['name']] = false
to_update[ package["name"] ] = false
end
end,
update = function(self)
refresh_button:get_children_by_id('icon')[1]:set_image(ICONS_DIR .. 'watch.svg')
self:get_children_by_id('name')[1]:set_opacity(0.4)
self:get_children_by_id('name')[1]:emit_signal('widget::redraw_needed')
refresh_button:get_children_by_id("icon")[1]:set_image(ICONS_DIR .. "watch.svg")
self:get_children_by_id("name")[1]:set_opacity(0.4)
self:get_children_by_id("name")[1]:emit_signal("widget::redraw_needed")
spawn.easy_async(
string.format([[sh -c 'yes | aptdcon --hide-terminal -u %s']], package['name']),
string.format([[sh -c 'yes | aptdcon --hide-terminal -u %s']], package["name"]),
function(stdout, stderr) -- luacheck:ignore 212
rows:remove_widgets(self)
end)
end
}
)
end,
})
row:connect_signal("mouse::enter", function(c)
c:set_bg(beautiful.bg_focus)
@ -241,10 +255,12 @@ local function worker(user_args)
end)
row:connect_signal("button::press", function(c, _, _, button)
if button == 1 then c:click() end
if button == 1 then
c:click()
end
end)
refresh_button:buttons(awful.util.table.join(awful.button({}, 1, function()
refresh_button:buttons(gears.table.join(awful.button({}, 1, function()
row:update()
end)))
@ -252,8 +268,7 @@ local function worker(user_args)
end
end
local header_checkbox = wibox.widget {
local header_checkbox = wibox.widget({
checked = false,
color = beautiful.bg_normal,
paddings = 2,
@ -263,8 +278,8 @@ local function worker(user_args)
check_color = beautiful.fg_urgent,
border_color = beautiful.bg_urgent,
border_width = 1,
widget = wibox.widget.checkbox
}
widget = wibox.widget.checkbox,
})
header_checkbox:connect_signal("button::press", function(c)
c:set_checked(not c.checked)
local cbs = rows.children
@ -273,12 +288,12 @@ local function worker(user_args)
end
end)
local header_refresh_icon = wibox.widget {
image = ICONS_DIR .. 'refresh-cw.svg',
local header_refresh_icon = wibox.widget({
image = ICONS_DIR .. "refresh-cw.svg",
resize = false,
widget = wibox.widget.imagebox
}
header_refresh_icon:buttons(awful.util.table.join(awful.button({}, 1, function()
widget = wibox.widget.imagebox,
})
header_refresh_icon:buttons(gears.table.join(awful.button({}, 1, function()
print(#to_update)
for _, v in pairs(to_update) do
if v ~= nil then
@ -287,63 +302,69 @@ local function worker(user_args)
end
end)))
local header_row = wibox.widget {
local header_row = wibox.widget({
{
{
{
header_checkbox,
valign = 'center',
valign = "center",
layout = wibox.container.place,
},
{
{
id = 'name',
markup = '<b>' .. #rows.children .. '</b> packages to update',
widget = wibox.widget.textbox
id = "name",
markup = "<b>" .. #rows.children .. "</b> packages to update",
widget = wibox.widget.textbox,
},
halign = 'center',
layout = wibox.container.place
halign = "center",
layout = wibox.container.place,
},
{
header_refresh_icon,
halign = 'right',
valign = 'center',
halign = "right",
valign = "center",
layout = wibox.container.place,
},
layout = wibox.layout.align.horizontal
layout = wibox.layout.align.horizontal,
},
margins = 8,
layout = wibox.container.margin
layout = wibox.container.margin,
},
bg = beautiful.bg_normal,
widget = wibox.container.background
}
widget = wibox.container.background,
})
wibox_popup:setup {
wibox_popup:setup({
header_row,
rows,
layout = wibox.layout.fixed.vertical
}
layout = wibox.layout.fixed.vertical,
})
end
apt_widget:buttons(
awful.util.table.join(
awful.button({}, 1, function()
apt_widget:buttons(gears.table.join(awful.button({}, 1, function()
if wibox_popup.visible then
wibox_popup.visible = not wibox_popup.visible
else
spawn.easy_async(LIST_PACKAGES,
function(stdout, stderr)
spawn.easy_async(LIST_PACKAGES, function(stdout, stderr)
rebuild_widget(stdout, stderr)
wibox_popup.visible = true
awful.placement.top(wibox_popup, { margins = { top = 20 }, parent = mouse })
end)
end
end)
)
)
end)))
return apt_widget
wibox_popup:connect_signal("mouse::leave", function()
if wibox_popup.visible then
wibox_popup.visible = false
end
end)
return apt_widget_button
end
return setmetatable(apt_widget, { __call = function(_, ...) return worker(...) end })
return setmetatable(apt_widget, {
__call = function(_, ...)
return worker(...)
end,
})