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

prevent creating user settings file when api key found from common config

Browse source
This commit is contained in:
Alan Hamlett 2019-05-29 06:42:38 -07:00
parent 405211bb07
commit a20161164c
1 changed files with 39 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
WakaTime.py
View file

@ -146,6 +146,41 @@ except ImportError:
return None return None
class ApiKey(object):
_key = None
def read(self):
if self._key:
return self._key
key = SETTINGS.get('api_key')
if key:
self._key = key
return self._key
try:
configs = parseConfigFile()
if configs:
if configs.has_option('settings', 'api_key'):
key = configs.get('settings', 'api_key')
if key:
self._key = key
return self._key
except:
pass
return self._key
def write(self, key):
global SETTINGS
self._key = key
SETTINGS.set('api_key', str(key))
sublime.save_settings(SETTINGS_FILE)
APIKEY = ApiKey()
def set_timeout(callback, seconds): def set_timeout(callback, seconds):
"""Runs the callback after the given seconds delay. """Runs the callback after the given seconds delay.
@ -223,7 +258,7 @@ class FetchStatusBarCodingTime(threading.Thread):
threading.Thread.__init__(self) threading.Thread.__init__(self)
self.debug = SETTINGS.get('debug') self.debug = SETTINGS.get('debug')
self.api_key = SETTINGS.get('api_key', '') self.api_key = APIKEY.read() or ''
self.proxy = SETTINGS.get('proxy') self.proxy = SETTINGS.get('proxy')
self.python_binary = SETTINGS.get('python_binary') self.python_binary = SETTINGS.get('python_binary')
@ -270,29 +305,14 @@ class FetchStatusBarCodingTime(threading.Thread):
def prompt_api_key(): def prompt_api_key():
global SETTINGS if APIKEY.read():
if SETTINGS.get('api_key'):
return True return True
try:
configs = parseConfigFile()
if configs is not None:
if configs.has_option('settings', 'api_key'):
key = configs.get('settings', 'api_key')
if key:
SETTINGS.set('api_key', str(key))
sublime.save_settings(SETTINGS_FILE)
return True
except:
pass
window = sublime.active_window() window = sublime.active_window()
if window: if window:
def got_key(text): def got_key(text):
if text: if text:
SETTINGS.set('api_key', str(text)) APIKEY.write(text)
sublime.save_settings(SETTINGS_FILE)
window.show_input_panel('[WakaTime] Enter your wakatime.com api key:', '', got_key, None, None) window.show_input_panel('[WakaTime] Enter your wakatime.com api key:', '', got_key, None, None)
return True return True
else: else:
@ -568,7 +588,7 @@ class SendHeartbeatsThread(threading.Thread):
threading.Thread.__init__(self) threading.Thread.__init__(self)
self.debug = SETTINGS.get('debug') self.debug = SETTINGS.get('debug')
self.api_key = SETTINGS.get('api_key', '') self.api_key = APIKEY.read() or ''
self.ignore = SETTINGS.get('ignore', []) self.ignore = SETTINGS.get('ignore', [])
self.include = SETTINGS.get('include', []) self.include = SETTINGS.get('include', [])
self.hidefilenames = SETTINGS.get('hidefilenames') self.hidefilenames = SETTINGS.get('hidefilenames')