Skip to content

Commit

Permalink
fix CI warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
nuno-silva committed Nov 18, 2023
1 parent a878aba commit 58d2ab6
Show file tree
Hide file tree
Showing 4 changed files with 38 additions and 28 deletions.
1 change: 0 additions & 1 deletion apt-widget/apt-widget.lua
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ local function script_path()
return str:match("(.*/)")
end

local HOME_DIR = os.getenv("HOME")
local WIDGET_DIR = script_path()
local ICONS_DIR = WIDGET_DIR .. "/icons/"

Expand Down
2 changes: 1 addition & 1 deletion cpu-widget/cpu-widget.lua
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ local process_rows = {
}

-- Remove spaces at end and beggining of a string
function trim(s)
local function trim(s)
return (s:gsub("^%s*(.-)%s*$", "%1"))
end

Expand Down
52 changes: 31 additions & 21 deletions docker-widget/docker.lua
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ local docker_widget = wibox.widget {
}

local parse_container = function(line)
local name, id, image, how_long, size, actual_status
local name, id, image, status, how_long, size, actual_status
if string.find(line, '::Created::') then
name, id, image, size = line:match(DOCKER_CREATED_STATUS_PATTERN)
actual_status = 'Created'
Expand Down Expand Up @@ -182,14 +182,19 @@ local function worker(user_args)
status_icon:set_opacity(0.2)
status_icon:emit_signal('widget::redraw_needed')

spawn.easy_async(executable_name .. ' ' .. command .. ' ' .. container['name'], function(_, stderr)
if stderr ~= '' then show_warning(stderr) end
spawn.easy_async(string.format(LIST_CONTAINERS_CMD, executable_name, number_of_containers),
function(stdout, container_errors)
rebuild_widget(stdout, container_errors)
end)
end)
end) ) )
spawn.easy_async(executable_name .. ' ' .. command .. ' ' .. container['name'],
function(_, stderr)
if stderr ~= '' then show_warning(stderr) end
spawn.easy_async(
string.format(LIST_CONTAINERS_CMD,executable_name, number_of_containers),
function(stdout, container_errors)
rebuild_widget(stdout, container_errors)
end
)
end
)
end) )
)
else
start_stop_button = nil
end
Expand Down Expand Up @@ -241,12 +246,14 @@ local function worker(user_args)
status_icon:set_opacity(0.2)
status_icon:emit_signal('widget::redraw_needed')

awful.spawn.easy_async(executable_name .. ' ' .. command .. ' ' .. container['name'], function(_, stderr)
if stderr ~= '' then show_warning(stderr) end
spawn.easy_async(string.format(LIST_CONTAINERS_CMD, executable_name, number_of_containers),
function(stdout, container_errors)
rebuild_widget(stdout, container_errors)
end)
awful.spawn.easy_async(executable_name .. ' ' .. command .. ' ' .. container['name'],
function(_, stderr)
if stderr ~= '' then show_warning(stderr) end
spawn.easy_async(string.format(LIST_CONTAINERS_CMD,
executable_name, number_of_containers),
function(stdout, container_errors)
rebuild_widget(stdout, container_errors)
end)
end)
end) ) )
else
Expand All @@ -273,12 +280,15 @@ local function worker(user_args)
}
delete_button:buttons(
gears.table.join( awful.button({}, 1, function()
awful.spawn.easy_async(executable_name .. ' rm ' .. container['name'], function(_, rm_stderr)
if rm_stderr ~= '' then show_warning(rm_stderr) end
spawn.easy_async(string.format(LIST_CONTAINERS_CMD, executable_name, number_of_containers),
function(lc_stdout, lc_stderr)
rebuild_widget(lc_stdout, lc_stderr) end)
end)
awful.spawn.easy_async(executable_name .. ' rm ' .. container['name'],
function(_, rm_stderr)
if rm_stderr ~= '' then show_warning(rm_stderr) end
spawn.easy_async(string.format(LIST_CONTAINERS_CMD,
executable_name, number_of_containers),
function(lc_stdout, lc_stderr)
rebuild_widget(lc_stdout, lc_stderr)
end)
end)
end)))

local old_cursor, old_wibox
Expand Down
11 changes: 6 additions & 5 deletions mpris-widget/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -179,13 +179,14 @@ local function worker()
watch(string.format(GET_MPD_CMD, "'" .. default_player .. "'"), 1, update_graphic, mpris_widget)

local mpris_popup = awful.widget.watch(
"playerctl metadata --format '{{ status }}: {{ artist }} - {{ title }}\nDuration: {{ duration(position) }}/{{ duration(mpris:length) }}'",
"playerctl metadata --format '{{ status }}: {{ artist }} - {{ title }}\n"
.. "Duration: {{ duration(position) }}/{{ duration(mpris:length) }}'",
1,
function(popup, stdout)
function(_popup, stdout)
local metadata = stdout
if popup.visible then
popup:get_widget().text = metadata
popup:move_next_to(mouse.current_widget_geometry)
if _popup.visible then
_popup:get_widget().text = metadata
_popup:move_next_to(mouse.current_widget_geometry)
end
end,
awful.popup {
Expand Down

0 comments on commit 58d2ab6

Please sign in to comment.