Skip to content

add branch name to payload #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
FilipHarald wants to merge 10 commits into
base: master
Choose a base branch
from
Open

add branch name to payload #27

Changes from 6 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8cc5df2
added git branch to pushed data
FilipHarald Mar 26, 2022
3b5906c
fixed var
FilipHarald Mar 26, 2022
b1b9c3e
moving git branch to only occur on heartbeat
FilipHarald May 15, 2022
943f55d
changed to caching branch name
FilipHarald May 15, 2022
da5e9bd
changed branch timestamp name, and changed initialization to 0 instead
FilipHarald May 15, 2022
e96db58
updating cached branch is now async
FilipHarald May 21, 2022
571f3b0
Merge remote-tracking branch 'upstream/master'
FilipHarald Jun 17, 2023
3f340f0
fixed it
FilipHarald Jun 17, 2023
d41026d
changed to undo N/A branch
FilipHarald Jun 17, 2023
b2319d5
Merge branch 'master' of github.com:ActivityWatch/aw-watcher-vim
FilipHarald Nov 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 20 additions & 1 deletion plugin/activitywatch.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ let s:file = ''
let s:language = ''
let s:project = ''

let s:last_branch_update = 0
let s:is_changed_branch = 0
let s:branch = ''

let s:connected = 0
let s:apiurl_host = get(g:, 'aw_apiurl_host', '127.0.0.1')
let s:apiurl_port = get(g:, 'aw_apiurl_port', '5600')
Expand Down Expand Up @@ -105,6 +109,17 @@ function! s:CreateBucket()
call HTTPPostJson(s:bucket_apiurl, l:body)
endfunc

function! s:RefreshGitBranch(localtime)
if a:localtime - s:last_branch_update > 5
let s:last_branch_update = a:localtime
let l:cmd_result = systemlist('git branch --show-current')[0]
Copy link
Copy Markdown
Member

@johan-bjareholt johan-bjareholt May 27, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Like I said before, systemlist is a synchronous operation and needs to be replaced with something asynchronous such as jobstart/job_start.

let l:current_branch = (cmd_result =~ '^fatal: ') ? 'N/A' : cmd_result
let s:is_changed_branch = l:current_branch == s:branch ? 0 : 1
let s:branch = l:current_branch
endif
"echo printf('branch %d is_changed_branch %s', s:branch, s:is_changed_branch)
endfunc

function! s:Heartbeat()
" Only send heartbeats if we can connect to aw-server
if s:connected < 1
Expand All @@ -116,11 +131,13 @@ function! s:Heartbeat()
let l:file = expand('%p')
let l:language = &filetype
let l:project = getcwd()
call s:RefreshGitBranch(l:localtime)
" Only send heartbeat if data was changed or more than 1 second has passed
" since last heartbeat
if s:file != l:file ||
\ s:language != l:language ||
\ s:project != l:project ||
\ s:is_changed_branch == 1 ||
\ l:localtime - s:last_heartbeat > 1

let l:req_body = {
Expand All @@ -129,7 +146,8 @@ function! s:Heartbeat()
\ 'data': {
\ 'file': l:file,
\ 'language': l:language,
\ 'project': l:project
\ 'project': l:project,
\ 'branch': s:branch
\ }
\}
call HTTPPostJson(s:heartbeat_apiurl, l:req_body)
Expand All @@ -142,6 +160,7 @@ endfunc

function! AWStart()
call s:CreateBucket()
call s:RefreshGitBranch(localtime())
endfunc

function! AWStop()
Expand Down