lavatech/rana-cli
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

force file path to use system separator

Browse source
This commit is contained in:
Alan Hamlett 2016-09-13 15:47:34 +02:00
parent 270d9dc3c7
commit 7ef63ac191
1 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
wakatime/main.py
View file

@ -471,6 +471,17 @@ def sync_offline_heartbeats(args, hostname):
return SUCCESS return SUCCESS
def format_file_path(filepath):
"""Formats a path as absolute and with the correct platform separator."""
try:
filepath = os.path.realpath(os.path.abspath(filepath))
filepath = re.sub(r'[/\\]', os.path.sep, filepath)
except:
pass
return filepath
def process_heartbeat(args, configs, hostname, heartbeat): def process_heartbeat(args, configs, hostname, heartbeat):
exclude = should_exclude(heartbeat['entity'], args.include, args.exclude) exclude = should_exclude(heartbeat['entity'], args.include, args.exclude)
if exclude is not False: if exclude is not False:
@ -482,6 +493,9 @@ def process_heartbeat(args, configs, hostname, heartbeat):
if heartbeat.get('entity_type') not in ['file', 'domain', 'app']: if heartbeat.get('entity_type') not in ['file', 'domain', 'app']:
heartbeat['entity_type'] = 'file' heartbeat['entity_type'] = 'file'
if heartbeat['entity_type'] == 'file':
heartbeat['entity'] = format_file_path(heartbeat['entity'])
if heartbeat['entity_type'] != 'file' or os.path.isfile(heartbeat['entity']): if heartbeat['entity_type'] != 'file' or os.path.isfile(heartbeat['entity']):
stats = get_file_stats(heartbeat['entity'], stats = get_file_stats(heartbeat['entity'],