Skip to content

Commit

Permalink
rename shared state temp file
Browse files Browse the repository at this point in the history
  • Loading branch information
alanhamlett committed Apr 13, 2022
1 parent f808057 commit 92f7029
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
10 changes: 5 additions & 5 deletions plugin/wakatime.vim
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,12 @@ let s:VERSION = '9.0.1'
let s:plugin_root_folder = substitute(expand("<sfile>:p:h:h"), '\', '/', 'g')
let s:config_file = s:home . '/.wakatime.cfg'
let s:default_configs = ['[settings]', 'debug = false', 'hidefilenames = false', 'ignore =', ' COMMIT_EDITMSG$', ' PULLREQ_EDITMSG$', ' MERGE_MSG$', ' TAG_EDITMSG$']
let s:data_file = s:home . '/.wakatime/wakatime.vim_tmp_state'
let s:shared_state_file = s:home . '/.wakatime/vim_shared_state'
let s:has_reltime = has('reltime') && localtime() - 1 < split(split(reltimestr(reltime()))[0], '\.')[0]
let s:config_file_already_setup = s:false
let s:debug_mode_already_setup = s:false
let s:is_debug_on = s:false
let s:local_cache_expire = 10 " seconds between reading s:data_file
let s:local_cache_expire = 10 " seconds between reading s:shared_state_file
let s:last_heartbeat = {'last_activity_at': 0, 'last_heartbeat_at': 0, 'file': ''}
let s:heartbeats_buffer = []
let s:send_buffer_seconds = 30 " seconds between sending buffered heartbeats
Expand Down Expand Up @@ -636,10 +636,10 @@ EOF

function! s:GetLastHeartbeat()
if !s:last_heartbeat.last_activity_at || localtime() - s:last_heartbeat.last_activity_at > s:local_cache_expire
if !filereadable(s:data_file)
if !filereadable(s:shared_state_file)
return {'last_activity_at': 0, 'last_heartbeat_at': 0, 'file': ''}
endif
let last = readfile(s:data_file, '', 3)
let last = readfile(s:shared_state_file, '', 3)
if len(last) == 3
let s:last_heartbeat.last_heartbeat_at = last[1]
let s:last_heartbeat.file = last[2]
Expand All @@ -658,7 +658,7 @@ EOF

function! s:SetLastHeartbeat(last_activity_at, last_heartbeat_at, file)
call s:SetLastHeartbeatInMemory(a:last_activity_at, a:last_heartbeat_at, a:file)
call writefile([s:n2s(a:last_activity_at), s:n2s(a:last_heartbeat_at), a:file], s:data_file)
call writefile([s:n2s(a:last_activity_at), s:n2s(a:last_heartbeat_at), a:file], s:shared_state_file)
endfunction

function! s:EnoughTimePassed(now, last)
Expand Down
4 changes: 2 additions & 2 deletions scripts/install_cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -156,9 +156,9 @@ def log(message, *args, **kwargs):
elif len(kwargs) > 0:
msg = message.format(**kwargs)
try:
print('[WakaTime] {msg}'.format(msg=msg))
print('[WakaTime Install] {msg}'.format(msg=msg))
except UnicodeDecodeError:
print(u('[WakaTime] {msg}').format(msg=u(msg)))
print(u('[WakaTime Install] {msg}').format(msg=u(msg)))


def getHomeFolder():
Expand Down

0 comments on commit 92f7029

Please sign in to comment.