diff options
| -rw-r--r-- | bitbucket-widget/bitbucket.lua | 90 | ||||
| -rwxr-xr-x | bitbucket-widget/test_bitbucket_api.sh | 8 |
2 files changed, 39 insertions, 59 deletions
diff --git a/bitbucket-widget/bitbucket.lua b/bitbucket-widget/bitbucket.lua index 791ae8c..245d50a 100644 --- a/bitbucket-widget/bitbucket.lua +++ b/bitbucket-widget/bitbucket.lua @@ -1,11 +1,11 @@ ------------------------------------------------- --- bitbucket Widget for Awesome Window Manager --- Shows the number of currently assigned issues +-- Bitbucket Widget for Awesome Window Manager +-- Shows the number of currently assigned pull requests -- More details could be found here: -- https://github.com/streetturtle/awesome-wm-widgets/tree/master/bitbucket-widget -- @author Pavel Makhov --- @copyright 2019 Pavel Makhov +-- @copyright 2020 Pavel Makhov ------------------------------------------------- local awful = require("awful") @@ -17,7 +17,6 @@ local naughty = require("naughty") local gears = require("gears") local beautiful = require("beautiful") local gfs = require("gears.filesystem") -local gs = require("gears.string") local HOME_DIR = os.getenv("HOME") @@ -26,33 +25,24 @@ local DOWNLOAD_AVATAR_CMD = [[bash -c "curl -n --create-dirs -o %s/.cache/awmw/b local bitbucket_widget = {} +local function show_warning(message) + naughty.notify{ + preset = naughty.config.presets.critical, + title = 'Bitbucket Widget', + text = message} +end + local function worker(args) local args = args or {} local icon = args.icon or HOME_DIR .. '/.config/awesome/awesome-wm-widgets/bitbucket-widget/bitbucket-icon-gradient-blue.svg' - local host = args.host or naughty.notify{ - preset = naughty.config.presets.critical, - title = 'Bitbucket Widget', - text = 'Bitbucket host is unknown'} - - local account_id = args.account_id or naughty.notify{ - preset = naughty.config.presets.critical, - title = 'Bitbucket Widget', - text = 'Account Id is not set'} - - local workspace = args.workspace or naughty.notify{ - preset = naughty.config.presets.critical, - title = 'Bitbucket Widget', - text = 'Workspace is not set'} - - local slug = args.slug or naughty.notify{ - preset = naughty.config.presets.critical, - title = 'Bitbucket Widget', - text = 'Slug is not set'} + local host = args.host or show_warning('Bitbucket host is unknown') + local account_id = args.account_id or show_warning('Account Id is not set') + local workspace = args.workspace or show_warning('Workspace is not set') + local repo_slug = args.repo_slug or show_warning('Repo slug is not set') - local current_number_of_reviews - local previous_number_of_reviews = 0 + local current_number_of_prs local rows = { { widget = wibox.widget.textbox }, @@ -84,42 +74,40 @@ local function worker(args) widget = wibox.widget.textbox }, { - id = "new_rev", + id = "new_pr", widget = wibox.widget.textbox }, layout = wibox.layout.fixed.horizontal, set_text = function(self, new_value) self.txt.text = new_value - end, - set_unseen_review = function(self, is_new_review) - self.new_rev.text = is_new_review and '*' or '' end } local update_widget = function(widget, stdout, stderr, _, _) - + if stderr ~= '' then show_warning(stderr) end + local result = json.decode(stdout) - current_number_of_reviews = rawlen(result.values) + current_number_of_prs = rawlen(result.values) - if current_number_of_reviews == 0 then + if current_number_of_prs == 0 then widget:set_visible(false) return end widget:set_visible(true) - widget:set_text(current_number_of_reviews) + widget:set_text(current_number_of_prs) for i = 0, #rows do rows[i]=nil end - for _, value in ipairs(result.values) do - local path_to_avatar = os.getenv("HOME") ..'/.cache/awmw/bitbucket-widget/avatars/' .. value.author.account_id + for _, pr in ipairs(result.values) do + local path_to_avatar = os.getenv("HOME") ..'/.cache/awmw/bitbucket-widget/avatars/' .. pr.author.account_id if not gfs.file_readable(path_to_avatar) then spawn.easy_async(string.format( DOWNLOAD_AVATAR_CMD, HOME_DIR, - value.author.account_id, - value.author.links.avatar.href)) + pr.author.account_id, + pr.author.links.avatar.href)) end local row = wibox.widget { @@ -138,16 +126,11 @@ local function worker(args) }, { { - markup = '<b>' .. value.title .. '</b>', - align = 'center', + markup = '<b>' .. pr.title .. '</b>', widget = wibox.widget.textbox }, - -- { - -- text = issue.fields.summary, - -- widget = wibox.widget.textbox - -- }, { - text = value.author.display_name, + text = pr.author.display_name, widget = wibox.widget.textbox }, layout = wibox.layout.align.vertical @@ -161,17 +144,13 @@ local function worker(args) widget = wibox.container.background } - row:connect_signal("button::release", function(_, _, _, button) - spawn.with_shell("xdg-open " .. value.links.html.href) - end) - row:connect_signal("mouse::enter", function(c) c:set_bg(beautiful.bg_focus) end) row:connect_signal("mouse::leave", function(c) c:set_bg(beautiful.bg_normal) end) row:buttons( awful.util.table.join( awful.button({}, 1, function() - spawn.with_shell("xdg-open " .. value.links.html.href) + spawn.with_shell("xdg-open " .. pr.links.html.href) popup.visible = false end) ) @@ -189,20 +168,13 @@ local function worker(args) if popup.visible then popup.visible = not popup.visible else - local geo = mouse.current_widget_geometry - local x = geo.x + (geo.width / 2) - (popup:geometry().width / 2) - popup:move_next_to({x = x, y = geo.y + 22, width = 0, height = geo.height}) - - -- popup:move_next_to(mouse.current_widget_geometry) + popup:move_next_to(mouse.current_widget_geometry) end end) ) ) - --naughty.notify{ - -- text = string.format(GET_ISSUES_CMD, host, query:gsub(" ", "+")), - -- run = function() spawn.with_shell("echo '" .. string.format(GET_ISSUES_CMD, host, query:gsub(" ", "+")) .. "' | xclip -selection clipboard") end - --} - watch(string.format(GET_PRS_CMD, host, workspace, slug, account_id), + + watch(string.format(GET_PRS_CMD, host, workspace, repo_slug, account_id), 10, update_widget, bitbucket_widget) return bitbucket_widget end diff --git a/bitbucket-widget/test_bitbucket_api.sh b/bitbucket-widget/test_bitbucket_api.sh new file mode 100755 index 0000000..378b3ef --- /dev/null +++ b/bitbucket-widget/test_bitbucket_api.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash + +HOST='https://api.bitbucket.org' +ACCOUNT_ID='' +WORKSPACE='' +REPO_SLUG='' + +curl -s -n "${HOST}/2.0/repositories/${WORKSPACE}/${REPO_SLUG}/pullrequests?fields=values.title,values.links.html,values.author.display_name,values.author.links.avatar&q=reviewers.account_id+%3D+%22${ACCOUNT_ID}%22"
\ No newline at end of file |