Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replace hard-coded config file path with a configurable one. #95

Closed
wants to merge 1 commit into from
Closed

Replace hard-coded config file path with a configurable one. #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions lib/wakatime.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,14 +159,14 @@ settingChangedHandler = (settings, initial) ->
apiKey = settings.apikey
if isValidApiKey(apiKey)
atom.config.set 'wakatime.apikey', '' # clear setting so it updates in UI
atom.config.set 'wakatime.apikey', 'Saved in your ~/.wakatime.cfg file'
atom.config.set 'wakatime.apikey', 'Saved in your ' + atom.config.get 'wakatime.configfile' + ' file'
saveApiKey apiKey
else if initial
atom.config.set 'wakatime.apikey', '' # clear setting so it updates in UI
atom.config.set 'wakatime.apikey', 'Enter your api key...'

saveApiKey = (apiKey) ->
configFile = path.join getUserHome(), '.wakatime.cfg'
configFile = path.join getUserHome(), atom.config.get 'wakatime.configfile'
fs.readFile configFile, 'utf-8', (err, inp) ->
if err?
log.debug 'Error: could not read wakatime config file'
Expand Down Expand Up @@ -222,7 +222,7 @@ loadDependencies = ->
ini = require 'ini'

setupConfigs = ->
configFile = path.join getUserHome(), '.wakatime.cfg'
configFile = path.join getUserHome(), atom.config.get 'wakatime.configfile'
fs.readFile configFile, 'utf-8', (err, configContent) ->
if err?
log.debug 'Error: could not read wakatime config file'
Expand All @@ -231,7 +231,7 @@ setupConfigs = ->
commonConfigs = ini.decode configContent
if commonConfigs? and commonConfigs.settings? and isValidApiKey(commonConfigs.settings.api_key)
atom.config.set 'wakatime.apikey', '' # clear setting so it updates in UI
atom.config.set 'wakatime.apikey', 'Saved in your ~/.wakatime.cfg file'
atom.config.set 'wakatime.apikey', 'Saved in your config file'
else
settingChangedHandler atom.config.get('wakatime'), true

Expand Down Expand Up @@ -522,7 +522,7 @@ sendHeartbeat = (file, lineno, isWrite) ->

# fix for wakatime/atom-wakatime#65
args.push('--config')
args.push(path.join getUserHome(), '.wakatime.cfg')
args.push(path.join getUserHome(), atom.config.get 'wakatime.configfile' )

if atom.project.contains(currentFile)
for rootDir in atom.project.rootDirectories
Expand Down Expand Up @@ -553,7 +553,7 @@ executeHeartbeatProcess = (python, args, tries) ->
status = null
title = 'WakaTime Offline, coding activity will sync when online.'
else if proc.exitCode == 103
msg = 'An error occured while parsing ~/.wakatime.cfg. Check ~/.wakatime.log for more info.'
msg = 'An error occured while parsing ' + atom.config.get 'wakatime.configfile' + ' . Check ~/.wakatime.log for more info.'
status = 'Error'
title = msg
else if proc.exitCode == 104
Expand Down Expand Up @@ -600,7 +600,7 @@ getToday = () ->
if atom.config.get 'wakatime.disableSSLCertVerify'
args.push('--no-ssl-verify')
args.push('--config')
args.push(path.join getUserHome(), '.wakatime.cfg')
args.push(path.join getUserHome(), atom.config.get 'wakatime.configfile')

try
proc = child_process.execFile(python, args, (error, stdout, stderr) ->
Expand Down
7 changes: 7 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,13 @@
"git"
],
"configSchema": {
"configfile": {
"title": "Config File Location",
"description": "The place of your config file relative to your home folder",
"type": "string",
"default": ".wakatime.cfg",
"order": 0
},
"apikey": {
"title": "Api Key",
"description": "Your secret key from https://wakatime.com/settings.",
Expand Down