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

switch registry warnings to debug log level

Browse source
This commit is contained in:
Alan Hamlett 2015-10-02 12:09:37 -07:00
parent 6681409e98
commit 77594700bd
1 changed files with 52 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
WakaTime.py
View file

@ -48,6 +48,13 @@ LOCK = threading.RLock()
PYTHON_LOCATION = None PYTHON_LOCATION = None
# Log Levels
DEBUG = 'DEBUG'
INFO = 'INFO'
WARNING = 'WARNING'
ERROR = 'ERROR'
# add wakatime package to path # add wakatime package to path
sys.path.insert(0, os.path.join(PLUGIN_DIR, 'packages')) sys.path.insert(0, os.path.join(PLUGIN_DIR, 'packages'))
try: try:
@ -56,6 +63,20 @@ except ImportError:
pass pass
def log(lvl, message, *args, **kwargs):
try:
if lvl == DEBUG and not SETTINGS.get('debug'):
return
msg = message
if len(args) > 0:
msg = message.format(*args)
elif len(kwargs) > 0:
msg = message.format(**kwargs)
print('[WakaTime] [{lvl}] {msg}'.format(lvl=lvl, msg=msg))
except RuntimeError:
sublime.set_timeout(lambda: log(lvl, message, *args, **kwargs), 0)
def createConfigFile(): def createConfigFile():
"""Creates the .wakatime.cfg INI file in $HOME directory, if it does """Creates the .wakatime.cfg INI file in $HOME directory, if it does
not already exist. not already exist.
@ -100,12 +121,11 @@ def prompt_api_key():
window.show_input_panel('[WakaTime] Enter your wakatime.com api key:', default_key, got_key, None, None) window.show_input_panel('[WakaTime] Enter your wakatime.com api key:', default_key, got_key, None, None)
return True return True
else: else:
print('[WakaTime] Error: Could not prompt for api key because no window found.') log(ERROR, 'Could not prompt for api key because no window found.')
return False return False
def python_binary(): def python_binary():
global PYTHON_LOCATION
if PYTHON_LOCATION is not None: if PYTHON_LOCATION is not None:
return PYTHON_LOCATION return PYTHON_LOCATION
@ -118,22 +138,28 @@ def python_binary():
for path in paths: for path in paths:
path = find_python_in_folder(path) path = find_python_in_folder(path)
if path is not None: if path is not None:
PYTHON_LOCATION = path set_python_binary_location(path)
return path return path
# look for python in windows registry # look for python in windows registry
path = find_python_from_registry(r'SOFTWARE\Python\PythonCore') path = find_python_from_registry(r'SOFTWARE\Python\PythonCore')
if path is not None: if path is not None:
PYTHON_LOCATION = path set_python_binary_location(path)
return path return path
path = find_python_from_registry(r'SOFTWARE\Wow6432Node\Python\PythonCore') path = find_python_from_registry(r'SOFTWARE\Wow6432Node\Python\PythonCore')
if path is not None: if path is not None:
PYTHON_LOCATION = path set_python_binary_location(path)
return path return path
return None return None
def set_python_binary_location(path):
global PYTHON_LOCATION
PYTHON_LOCATION = path
log(DEBUG, 'Python Binary Found: {0}'.format(path))
def find_python_from_registry(location, reg=None): def find_python_from_registry(location, reg=None):
if platform.system() != 'Windows' or winreg is None: if platform.system() != 'Windows' or winreg is None:
return None return None
@ -168,17 +194,24 @@ def find_python_from_registry(location, reg=None):
if path is not None: if path is not None:
path = find_python_in_folder(path) path = find_python_in_folder(path)
if path is not None: if path is not None:
log(DEBUG, 'Found python from {reg}\\{key}\\{version}\\{sub_key}.'.format(
reg=reg,
key=location,
version=version,
sub_key=sub_key,
))
return path return path
except WindowsError: except WindowsError:
print('[WakaTime] Warning: Could not read registry value "{reg}\\{key}\\{version}\\{sub_key}".'.format( log(DEBUG, 'Could not read registry value "{reg}\\{key}\\{version}\\{sub_key}".'.format(
reg='HKEY_CURRENT_USER', reg=reg,
key=location, key=location,
version=version, version=version,
sub_key=sub_key, sub_key=sub_key,
)) ))
except WindowsError: except WindowsError:
print('[WakaTime] Warning: Could not read registry value "{reg}\\{key}".'.format( if SETTINGS.get('debug'):
reg='HKEY_CURRENT_USER', log(DEBUG, 'Could not read registry value "{reg}\\{key}".'.format(
reg=reg,
key=location, key=location,
)) ))
@ -298,7 +331,7 @@ class SendHeartbeatThread(threading.Thread):
def send_heartbeat(self): def send_heartbeat(self):
if not self.api_key: if not self.api_key:
print('[WakaTime] Error: missing api key.') log(ERROR, 'missing api key.')
return return
ua = 'sublime/%d sublime-wakatime/%s' % (ST_VERSION, __version__) ua = 'sublime/%d sublime-wakatime/%s' % (ST_VERSION, __version__)
cmd = [ cmd = [
@ -324,8 +357,7 @@ class SendHeartbeatThread(threading.Thread):
cmd.append('--verbose') cmd.append('--verbose')
if python_binary(): if python_binary():
cmd.insert(0, python_binary()) cmd.insert(0, python_binary())
if self.debug: log(DEBUG, ' '.join(obfuscate_apikey(cmd)))
print('[WakaTime] %s' % ' '.join(obfuscate_apikey(cmd)))
if platform.system() == 'Windows': if platform.system() == 'Windows':
Popen(cmd, shell=False) Popen(cmd, shell=False)
else: else:
@ -333,7 +365,7 @@ class SendHeartbeatThread(threading.Thread):
Popen(cmd, stderr=stderr) Popen(cmd, stderr=stderr)
self.sent() self.sent()
else: else:
print('[WakaTime] Error: Unable to find python binary.') log(ERROR, 'Unable to find python binary.')
def sent(self): def sent(self):
sublime.set_timeout(self.set_status_bar, 0) sublime.set_timeout(self.set_status_bar, 0)
@ -357,7 +389,7 @@ class InstallPython(threading.Thread):
""" """
def run(self): def run(self):
print('[WakaTime] Downloading and installing python...') log(INFO, 'Downloading and installing python...')
url = 'https://www.python.org/ftp/python/3.4.3/python-3.4.3.msi' url = 'https://www.python.org/ftp/python/3.4.3/python-3.4.3.msi'
if platform.architecture()[0] == '64bit': if platform.architecture()[0] == '64bit':
url = 'https://www.python.org/ftp/python/3.4.3/python-3.4.3.amd64.msi' url = 'https://www.python.org/ftp/python/3.4.3/python-3.4.3.amd64.msi'
@ -378,10 +410,12 @@ class InstallPython(threading.Thread):
def plugin_loaded(): def plugin_loaded():
global SETTINGS global SETTINGS
print('[WakaTime] Initializing WakaTime plugin v%s' % __version__) log(INFO, 'Initializing WakaTime plugin v%s' % __version__)
SETTINGS = sublime.load_settings(SETTINGS_FILE)
if not python_binary(): if not python_binary():
print('[WakaTime] Warning: Python binary not found.') log(WARNING, 'Python binary not found.')
if platform.system() == 'Windows': if platform.system() == 'Windows':
thread = InstallPython() thread = InstallPython()
thread.start() thread.start()
@ -389,7 +423,6 @@ def plugin_loaded():
sublime.error_message("Unable to find Python binary!\nWakaTime needs Python to work correctly.\n\nGo to https://www.python.org/downloads") sublime.error_message("Unable to find Python binary!\nWakaTime needs Python to work correctly.\n\nGo to https://www.python.org/downloads")
return return
SETTINGS = sublime.load_settings(SETTINGS_FILE)
after_loaded() after_loaded()