From e791743eafdeece25033c28825f95e03e41ebf30 Mon Sep 17 00:00:00 2001 From: Nuno Silva Date: Sat, 18 Nov 2023 17:56:13 +0000 Subject: [PATCH] fix CI warnings from https://github.com/streetturtle/awesome-wm-widgets/actions/runs/6915243510/job/18813967822?pr=421 --- apt-widget/apt-widget.lua | 1 - cpu-widget/cpu-widget.lua | 2 +- docker-widget/docker.lua | 52 +++++++++++++++++++++++---------------- mpris-widget/init.lua | 11 +++++---- 4 files changed, 38 insertions(+), 28 deletions(-) diff --git a/apt-widget/apt-widget.lua b/apt-widget/apt-widget.lua index 0bd6e3d..a28a42c 100644 --- a/apt-widget/apt-widget.lua +++ b/apt-widget/apt-widget.lua @@ -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/" diff --git a/cpu-widget/cpu-widget.lua b/cpu-widget/cpu-widget.lua index 23b61f6..3cd0e8d 100644 --- a/cpu-widget/cpu-widget.lua +++ b/cpu-widget/cpu-widget.lua @@ -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 diff --git a/docker-widget/docker.lua b/docker-widget/docker.lua index 36cd320..27465f9 100644 --- a/docker-widget/docker.lua +++ b/docker-widget/docker.lua @@ -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' @@ -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 @@ -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 @@ -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 diff --git a/mpris-widget/init.lua b/mpris-widget/init.lua index 1402ba3..eb2dda6 100644 --- a/mpris-widget/init.lua +++ b/mpris-widget/init.lua @@ -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(callback_popup, stdout) local metadata = stdout - if popup.visible then - popup:get_widget().text = metadata - popup:move_next_to(mouse.current_widget_geometry) + if callback_popup.visible then + callback_popup:get_widget().text = metadata + callback_popup:move_next_to(mouse.current_widget_geometry) end end, awful.popup {