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

remove away prompt

This commit is contained in:
Alan Hamlett 2013-08-12 03:30:17 -07:00
parent 3d17c2dee7
commit 284d7247ee
1 changed files with 9 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
plugin/wakatime.vim
View File

@ -31,16 +31,6 @@ let s:VERSION = '0.2.6'
let s:old_cpo = &cpo
set cpo&vim
" Set default away minutes
if !exists("g:wakatime_AwayMinutes")
let g:wakatime_AwayMinutes = 10
endif
" Set default action frequency in minutes
if !exists("g:wakatime_ActionFrequency")
let g:wakatime_ActionFrequency = 5
endif
" To be backwards compatible, rename config file
if filereadable(expand("$HOME/.wakatime"))
exec "silent !mv" expand("$HOME/.wakatime") expand("$HOME/.wakatime.conf")
@ -55,6 +45,11 @@ let s:VERSION = '0.2.6'
endif
endif
" Set default action frequency in minutes
if !exists("g:wakatime_ActionFrequency")
let g:wakatime_ActionFrequency = 5
endif
" Globals
let s:plugin_directory = expand("<sfile>:p:h") . '/'
let s:last_action = 0
@ -78,7 +73,7 @@ let s:VERSION = '0.2.6'
return current_time
endfunction
function! s:Api(targetFile, time, endtime, is_write, last)
function! s:Api(targetFile, time, is_write, last)
let targetFile = a:targetFile
if targetFile == ''
let targetFile = a:last[2]
@ -91,16 +86,9 @@ let s:VERSION = '0.2.6'
if a:is_write
let cmd = cmd + ['--write']
endif
if a:endtime > 1
let cmd = cmd + ['--endtime', printf('%f', a:endtime)]
endif
"let cmd = cmd + ['--verbose']
exec 'silent !' . join(cmd, ' ') . ' &'
let time = a:time
if a:endtime > 1 && float2nr(round(time)) < float2nr(round(a:endtime))
let time = a:endtime
endif
call s:SetLastAction(time, time, targetFile)
call s:SetLastAction(a:time, a:time, targetFile)
endif
endfunction
@ -136,47 +124,6 @@ let s:VERSION = '0.2.6'
return 0
endfunction
function! s:ShouldPromptUser(now, last)
let prev = a:last[1]
if s:fresh || prev < 1
return 0
endif
let duration = a:now - prev
if duration > g:wakatime_AwayMinutes * 60
return 1
endif
return 0
endfunction
function! s:Away(now, last)
let minutes = ''
let duration = a:now - a:last[1]
let units = 'second'
if duration >= 60
let duration = round(duration / 60)
let units = 'minute'
if duration >= 60
let remainder = float2nr(round(duration)) % 60
if remainder > 0
let minutes = printf(" and %.f minute", remainder)
if remainder > 1
let minutes = minutes . 's'
endif
endif
let duration = round(duration / 60)
let units = 'hour'
endif
endif
if duration > 1
let units = units . 's'
endif
let answer = input(printf("You were away %.f %s%s. Add time to current file? (y/n)", duration, units, minutes))
if answer == "y"
return 1
endif
return 0
endfunction
" }}}
@ -187,19 +134,7 @@ let s:VERSION = '0.2.6'
let now = s:GetCurrentTime()
let last = s:GetLastAction()
if s:EnoughTimePassed(now, last) || targetFile != last[2]
if s:ShouldPromptUser(now, last)
if s:Away(now, last)
call s:Api(targetFile, now, last[0], 0, last)
else
call s:Api(targetFile, now, 0.0, 0, last)
endif
else
if !s:fresh
call s:Api(targetFile, now, last[0], 0, last)
else
call s:Api(targetFile, now, 0, 0, last)
endif
endif
call s:Api(targetFile, now, 0, last)
else
if now - last[1] > 5
call s:SetLastAction(last[0], now, targetFile)
@ -211,23 +146,7 @@ let s:VERSION = '0.2.6'
let targetFile = s:GetCurrentFile()
let now = s:GetCurrentTime()
let last = s:GetLastAction()
if s:EnoughTimePassed(now, last) || targetFile != last[2]
if s:ShouldPromptUser(now, last)
if s:Away(now, last)
call s:Api(targetFile, now, last[0], 1, last)
else
call s:Api(targetFile, now, 0.0, 1, last)
endif
else
if !s:fresh
call s:Api(targetFile, now, last[0], 1, last)
else
call s:Api(targetFile, now, 0, 1, last)
endif
endif
else
call s:Api(targetFile, now, 0.0, 1, last)
endif
call s:Api(targetFile, now, 1, last)
endfunction
" }}}