new version 0.1.3. Cleaned up plugin. Automatically creating ~/.wakatime.log file.

README.md

@@ -1,7 +1,7 @@
 vim-wakatime 0.1.2
 ===========
 
-Automatic time tracking.
+Automatic time tracking for Vim.
 
 Installation
 ------------
@@ -12,7 +12,7 @@ https://wakati.me
 
 2) Run this shell command replacing KEY with your api key:
 
-    echo "api_key=KEY" > ~/.wakatime
+    echo "api_key=KEY" >> ~/.wakatime
 
 3) Using [Vundle](https://github.com/gmarik/vundle), the Vim plugin manager:
 

plugin/wakatime.py

@@ -17,7 +17,7 @@ import logging as log
 
 
 # Config
-version = '0.1.2'
+version = '0.1.3'
 user_agent = 'vim-wakatime/%s (%s)' % (version, platform.platform())
 
 
@@ -118,14 +118,12 @@ def send_action(key, instance, action, task, timestamp, project, tags):
     url = 'https://www.wakati.me/api/v1/actions'
     data = {
         'type': action,
-        'task': task,
+        'task': os.path.realpath(task),
-        'time': time.time(),
+        'time': timestamp,
         'instance_id': instance,
         'project': project,
         'tags': tags,
     }
-    if timestamp:
-        data['time'] = timestamp
     request = urllib2.Request(url=url, data=json.dumps(data))
     request.add_header('User-Agent', user_agent)
     request.add_header('Content-Type', 'application/json')
@@ -173,7 +171,10 @@ def main(argv):
     if args.verbose:
         level = log.DEBUG
     del args.verbose
+    if not args.timestamp:
+        args.timestamp = time.time()
     log.basicConfig(filename=os.path.expanduser('~/.wakatime.log'), format='%(asctime)s vim-wakatime/'+version+' %(levelname)s %(message)s', datefmt='%Y-%m-%dT%H:%M:%SZ', level=level)
+    if os.path.isfile(os.path.realpath(args.task)):
         tags = tags_from_path(args.task)
         project = project_from_path(args.task)
         send_action(project=project, tags=tags, **vars(args))

plugin/wakatime.vim

@@ -1,8 +1,8 @@
 " ============================================================================
 " File:        wakatime.vim
-" Description: invisible time tracker using Wakati.Me
+" Description: Automatic time tracking for Vim.
 " Maintainer:  Wakati.Me <support@wakatime.com>
-" Version: 0.1.2
+" Version:     0.1.3
 " ============================================================================
 
 
@@ -58,49 +58,37 @@ let s:away_start = 0
     " Create logfile if does not exist
     exec "silent !touch ~/.wakatime.log"
 
-python << ENDPYTHON
+    python import time
-import vim
+    python import time
-import uuid
+    python import uuid
-import time
+    python import vim
-
+    python instance_id = str(uuid.uuid4())
-instance_id = str(uuid.uuid4())
+    python vim.command('let s:instance_id = "%s"' % instance_id)
-vim.command('let s:instance_id = "%s"' % instance_id)
-ENDPYTHON
 
 " }}}
 
 
 " Function Definitions {{{
 
-function! s:initVariable(var, value)
-    if !exists(a:var)
-        exec 'let ' . a:var . ' = ' . "'" . substitute(a:value, "'", "''", "g") . "'"
-        return 1
-    endif
-    return 0
-endfunction
-
     function! s:setUpdateTime()
         if &updatetime < 60 * 1000 * 2
             let &updatetime = g:wakatime_updatetime * 60 * 1000
         endif
     endfunction
-
     call s:setUpdateTime()
 
     function! s:GetCurrentFile()
         return expand("%:p")
     endfunction
 
-function! s:api(type, task)
+    function! s:GetCurrentTime()
-    if a:task != ''
+        python vim.command('let current_time="%f"' % time.time())
-        exec "silent !python " . s:plugin_directory . "/wakatime.py --key" g:wakatime_api_key "--instance" s:instance_id "--action" a:type "--task" shellescape(a:task) . " &"
+        return current_time
-    endif
     endfunction
 
-function! s:api_with_time(type, task, time)
+    function! s:api(type, task, time)
         if a:task != ''
-        exec "silent !python " . s:plugin_directory . "/wakatime.py --key" g:wakatime_api_key "--instance" s:instance_id "--action" a:type "--task" shellescape(a:task) "--time" printf("%f", a:time) . " &"
+            exec "silent !python " . s:plugin_directory . "/wakatime.py --key" g:wakatime_api_key "--instance" s:instance_id "--action" a:type "--task" shellescape(a:task) "--time" a:time . " &"
         endif
     endfunction
 
@@ -136,28 +124,23 @@ endfunction
 " Event Handlers {{{
 
     function! s:bufenter()
-    let task = s:GetCurrentFile()
+        call s:api("open_file", s:GetCurrentFile(), s:GetCurrentTime())
-    call s:api("open_file", task)
     endfunction
 
     function! s:bufleave()
-    let task = s:GetCurrentFile()
+        call s:api("close_file", s:GetCurrentFile(), s:GetCurrentTime())
-    call s:api("close_file", task)
     endfunction
 
     function! s:vimenter()
-    let task = s:GetCurrentFile()
+        call s:api("open_editor", s:GetCurrentFile(), s:GetCurrentTime())
-    call s:api("open_editor", task)
     endfunction
 
     function! s:vimleave()
-    let task = s:GetCurrentFile()
+        call s:api("quit_editor", s:GetCurrentFile(), s:GetCurrentTime())
-    call s:api("quit_editor", task)
     endfunction
 
     function! s:bufwrite()
-    let task = s:GetCurrentFile()
+        call s:api("write_file", s:GetCurrentFile(), s:GetCurrentTime())
-    call s:api("write_file", task)
     endfunction
 
     function! s:cursorhold()
@@ -172,7 +155,7 @@ function! s:cursormoved()
         " Don't do anything unless all other Vim instances are also away
         if !s:allServersAway()
             let s:away_start = 0
-        call s:api("ping", s:away_task)
+            call s:api("ping", s:away_task, s:GetCurrentTime())
             return
         endif
 
@@ -193,10 +176,10 @@ function! s:cursormoved()
         endif
         let answer = input(printf("You were away %.f %s. Add time to current file? (y/n)", away_duration, away_unit))
         if answer != "y"
-        call s:api_with_time("minimize_editor", s:away_task, s:away_start)
+            call s:api("minimize_editor", s:away_task, printf("%f", s:away_start))
-        call s:api_with_time("maximize_editor", s:away_task, away_end)
+            call s:api("maximize_editor", s:away_task, printf("%f", away_end))
         else
-        call s:api("ping", s:away_task)
+            call s:api("ping", s:away_task, s:GetCurrentTime())
         endif
         let s:away_start = 0
         "redraw!