luna/vim-rana-local
1
0
Fork 1
Code Issues Pull requests Releases Wiki Activity

handle case where current file is empty

Browse source
This commit is contained in:
Alan Hamlett 2015-12-29 09:43:16 -08:00
parent b3d56ee30c
commit f497ef6ff4
1 changed files with 24 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
plugin/wakatime.vim
View file

@ -32,6 +32,7 @@ let s:VERSION = '4.0.6'
let s:config_file = expand("$HOME/.wakatime.cfg") let s:config_file = expand("$HOME/.wakatime.cfg")
let s:data_file = expand("$HOME/.wakatime.data") let s:data_file = expand("$HOME/.wakatime.data")
let s:config_file_already_setup = 0 let s:config_file_already_setup = 0
let s:ignoredFiles = ["", "-MiniBufExplorer-", "--NO NAME--"]
let s:local_cache_expire = 10 let s:local_cache_expire = 10
let s:last_heartbeat = [0, 0, ''] let s:last_heartbeat = [0, 0, '']
@ -109,6 +110,13 @@ let s:VERSION = '4.0.6'
return substitute(shellescape(a:arg), '!', '\\!', '') return substitute(shellescape(a:arg), '!', '\\!', '')
endfunction endfunction
function! s:ListContains(list, el)
if index(a:list, a:el) >= 0
return 1
endif
return 0
endfunction
function! s:JoinArgs(args) function! s:JoinArgs(args)
let safeArgs = [] let safeArgs = []
for arg in a:args for arg in a:args
@ -117,12 +125,12 @@ let s:VERSION = '4.0.6'
return join(safeArgs, ' ') return join(safeArgs, ' ')
endfunction endfunction
function! s:Api(targetFile, time, is_write, last) function! s:SendHeartbeat(file, time, is_write, last)
let targetFile = a:targetFile let file = a:file
if targetFile == '' if file == ''
let targetFile = a:last[2] let file = a:last[2]
endif endif
if targetFile != '' if file != ''
let python_bin = g:wakatime_PythonBinary let python_bin = g:wakatime_PythonBinary
if has('win32') || has('win64') if has('win32') || has('win64')
if python_bin == 'python' if python_bin == 'python'
@ -130,7 +138,7 @@ let s:VERSION = '4.0.6'
endif endif
endif endif
let cmd = [python_bin, '-W', 'ignore', s:cli_location] let cmd = [python_bin, '-W', 'ignore', s:cli_location]
let cmd = cmd + ['--file', targetFile] let cmd = cmd + ['--file', file]
let cmd = cmd + ['--plugin', printf('vim/%d vim-wakatime/%s', v:version, s:VERSION)] let cmd = cmd + ['--plugin', printf('vim/%d vim-wakatime/%s', v:version, s:VERSION)]
if a:is_write if a:is_write
let cmd = cmd + ['--write'] let cmd = cmd + ['--write']
@ -141,7 +149,7 @@ let s:VERSION = '4.0.6'
else else
exec 'silent !' . s:JoinArgs(cmd) . ' &' exec 'silent !' . s:JoinArgs(cmd) . ' &'
endif endif
call s:SetLastHeartbeat(a:time, a:time, targetFile) call s:SetLastHeartbeat(a:time, a:time, file)
endif endif
endfunction endfunction
@ -158,13 +166,13 @@ let s:VERSION = '4.0.6'
return s:last_heartbeat return s:last_heartbeat
endfunction endfunction
function! s:SetLastHeartbeatLocally(time, last_update, targetFile) function! s:SetLastHeartbeatLocally(time, last_update, file)
let s:last_heartbeat = [a:time, a:last_update, a:targetFile] let s:last_heartbeat = [a:time, a:last_update, a:file]
endfunction endfunction
function! s:SetLastHeartbeat(time, last_update, targetFile) function! s:SetLastHeartbeat(time, last_update, file)
call s:SetLastHeartbeatLocally(a:time, a:last_update, a:targetFile) call s:SetLastHeartbeatLocally(a:time, a:last_update, a:file)
call writefile([substitute(printf('%d', a:time), ',', '.', ''), substitute(printf('%d', a:last_update), ',', '.', ''), a:targetFile], s:data_file) call writefile([substitute(printf('%d', a:time), ',', '.', ''), substitute(printf('%d', a:last_update), ',', '.', ''), a:file], s:data_file)
endfunction endfunction
function! s:EnoughTimePassed(now, last) function! s:EnoughTimePassed(now, last)
@ -182,12 +190,12 @@ let s:VERSION = '4.0.6'
function! s:handleActivity(is_write) function! s:handleActivity(is_write)
call s:SetupConfigFile() call s:SetupConfigFile()
let targetFile = s:GetCurrentFile() let file = s:GetCurrentFile()
let now = localtime() let now = localtime()
let last = s:GetLastHeartbeat() let last = s:GetLastHeartbeat()
if targetFile !~ "-MiniBufExplorer-" && targetFile !~ "--NO NAME--" && targetFile != "" if !empty(file) && !s:ListContains(s:ignoredFiles, file)
if a:is_write || s:EnoughTimePassed(now, last) || targetFile != last[2] if a:is_write || s:EnoughTimePassed(now, last) || file != last[2]
call s:Api(targetFile, now, a:is_write, last) call s:SendHeartbeat(file, now, a:is_write, last)
else else
if now - s:last_heartbeat[0] > s:local_cache_expire if now - s:last_heartbeat[0] > s:local_cache_expire
call s:SetLastHeartbeatLocally(now, last[1], last[2]) call s:SetLastHeartbeatLocally(now, last[1], last[2])