summaryrefslogtreecommitdiff
path: root/gitlab-widget
diff options
context:
space:
mode:
authorstreetturtle <streetturtle@gmail.com>2020-11-03 20:32:28 -0500
committerstreetturtle <streetturtle@gmail.com>2020-11-03 20:32:28 -0500
commitb10e3b7f45341f000f2b4fa5daf5377770f3d6cc (patch)
tree6bdfb0a4192175e318189cb5036ebab436e571a3 /gitlab-widget
parentbb4ba9dc907433a940180045e8ab43f39eb06a71 (diff)
[gitlab] fix #206 - better error handling
Diffstat (limited to 'gitlab-widget')
-rw-r--r--gitlab-widget/gitlab.lua55
1 files changed, 50 insertions, 5 deletions
diff --git a/gitlab-widget/gitlab.lua b/gitlab-widget/gitlab.lua
index 7a70113..3482347 100644
--- a/gitlab-widget/gitlab.lua
+++ b/gitlab-widget/gitlab.lua
@@ -17,17 +17,31 @@ local naughty = require("naughty")
local gears = require("gears")
local beautiful = require("beautiful")
local gfs = require("gears.filesystem")
+local color = require("gears.color")
local HOME_DIR = os.getenv("HOME")
local WIDGET_DIR = HOME_DIR .. '/.config/awesome/awesome-wm-widgets/gitlab-widget/'
-local GET_PRS_CMD= [[bash -c "curl -s --show-error --header 'PRIVATE-TOKEN: %s' '%s/api/v4/merge_requests?state=opened'"]]
-local DOWNLOAD_AVATAR_CMD = [[bash -c "curl -L -n --create-dirs -o %s/.cache/awmw/gitlab-widget/avatars/%s %s"]]
+local GET_PRS_CMD= [[bash -c "curl -s --connect-timeout 5 --show-error --header 'PRIVATE-TOKEN: %s' '%s/api/v4/merge_requests?state=opened'"]]
+local DOWNLOAD_AVATAR_CMD = [[bash -c "curl -L --create-dirs -o %s/.cache/awmw/gitlab-widget/avatars/%s %s"]]
local gitlab_widget = wibox.widget {
{
{
- id = 'icon',
- widget = wibox.widget.imagebox
+ {
+ id = 'icon',
+ widget = wibox.widget.imagebox
+ },
+ {
+ id = 'error_marker',
+ draw = function(self, context, cr, width, height)
+ cr:set_source(color(beautiful.fg_urgent))
+ cr:arc(height/4, height/4, height/4, 0, math.pi*2)
+ cr:fill()
+ end,
+ visible = false,
+ layout = wibox.widget.base.make_widget,
+ },
+ layout = wibox.layout.stack
},
margins = 4,
layout = wibox.container.margin
@@ -46,6 +60,18 @@ local gitlab_widget = wibox.widget {
end,
set_icon = function(self, new_value)
self:get_children_by_id('icon')[1]:set_image(new_value)
+ end,
+ is_everything_ok = function(self, is_ok)
+ if is_ok then
+ self:get_children_by_id('error_marker')[1]:set_visible(false)
+ self:get_children_by_id('icon')[1]:set_opacity(1)
+ self:get_children_by_id('icon')[1]:emit_signal('widget:redraw_needed')
+ else
+ self.txt:set_text('')
+ self:get_children_by_id('error_marker')[1]:set_visible(true)
+ self:get_children_by_id('icon')[1]:set_opacity(0.2)
+ self:get_children_by_id('icon')[1]:emit_signal('widget:redraw_needed')
+ end
end
}
@@ -102,6 +128,12 @@ local function ellipsize(text, length)
or text
end
+local warning_shown = false
+local tooltip = awful.tooltip {
+ mode = 'outside',
+ preferred_positions = {'bottom'},
+ }
+
local function worker(args)
local args = args or {}
@@ -122,10 +154,23 @@ local function worker(args)
local update_widget = function(widget, stdout, stderr, _, _)
if stderr ~= '' then
- show_warning(stderr)
+ if not warning_shown then
+ show_warning(stderr)
+ warning_shown = true
+ widget:is_everything_ok(false)
+ tooltip:add_to_object(widget)
+
+ widget:connect_signal('mouse::enter', function()
+ tooltip.text = stderr
+ end)
+ end
return
end
+ warning_shown = false
+ tooltip:remove_from_object(widget)
+ widget:is_everything_ok(true)
+
local result = json.decode(stdout)
current_number_of_prs = rawlen(result)