[Config] refactor config.

Signed-off-by: Eric Wang <[email protected]>

Author: skygragon

docs/advanced.md

@@ -17,7 +17,11 @@ Leetcode.com is restricting only one session alive in the same time, which means
 
 The good news is leetcode-cli will help a lot on this by trying re-login transparently and automatically without interrupting your current work whenever it detects your current session is expired. To enable this feature you could add following in your config then login again:
 
-	"AUTO_LOGIN": true
+	{
+		"autologin": {
+			"enable": true
+		}
+	}
 
 **NOTE: once enabled, your PASSWORD will be persisted locally for further using, so PLEASE be careful to ONLY enable this on your OWN computer for the sake of security!**
 
@@ -53,30 +57,42 @@ Create a JSON file named `.lcconfig` in your home directory, e.g.
 	$ cat ~/.lcconfig
 
 	{
-		"LANG": "java",
-		"EDITOR": "vim",
-		"USE_COLOR": true,
-		"COLOR_THEME": "default",
-		"AUTO_LOGIN": false,
-		"PLUGINS": {}
+		"auto_login": {
+			"enable": false
+		},
+		"code": {
+			"editor": "vim",
+			"lang": "cpp"
+		},
+		"color": {
+			"enable": true,
+			"theme": "default"
+		},
+		"icon": {
+			"theme": ""
+		},
+		"network": {
+			"concurrency": 10
+		},
+		"plugins": {}
 	}
 
 Here are some useful settings:
 
-* `AUTO_LOGIN` to enable auto login feature, see [Auto Login](#auto-login).
-* `COLOR_THEME` to set color theme used in output, see [Color Theme](#color-theme).
-* `EDITOR` to set editor used to open generated source file.
-* `ICON_THEME` to set icon them used in output.
-* `LANG` to set your default language used in coding.
-* `USE_COLOR` to enable colorful output.
-* `PLUGINS` to config each installed plugins, see [Plugins](#plugins).
+* `autologin:enable` to enable auto login feature, see [Auto Login](#auto-login).
+* `code:editor` to set editor used to open generated source file.
+* `code:lang` to set your default language used in coding.
+* `color:enable` to enable colorful output.
+* `color:theme` to set color theme used in output, see [Color Theme](#color-theme).
+* `icon:theme` to set icon them used in output.
+* `plugins` to config each installed plugins, see [Plugins](#plugins).
 
 *Example*
 
 Config for `github.js` and `cpp.lint.js` plugins:
 
 	{
-		"PLUGINS": {
+		"plugins": {
 			"github": {
 				"repo": "https://github.com/skygragon/test",
 				"token": "abcdefghijklmnopqrstuvwxyz"
@@ -95,9 +111,9 @@ You can choose to use colorful output or not.
 * `--color` to enable color.
 * `--no-color` to disable it.
 
-Or use configuration setting to avoid typing it repeatedly, see [USE_COLOR](#configuration).
+Or use configuration setting to avoid typing it repeatedly, see [color:enable](#configuration).
 
-When color is enabled, you can choose your favor color theme as well, see [COLOR_THEME](#configuration).
+When color is enabled, you can choose your favor color theme as well, see [color:theme](#configuration).
 
 Following are available themes:
 

docs/commands.md

@@ -146,7 +146,7 @@ Install plugin from local file:
 List all the plugins, `✘` means the plugin is disabled.
 
 	$ leetcode plugin
-	✔ retry                default         Plugin to retry last failed request if AUTO_LOGIN is on.
+	✔ retry                default         Plugin to retry last failed request if autologin is on.
 	✔ cache                default         Plugin to provide local cache.
 	✔ leetcode             default         Plugin to talk with leetcode APIs.
 
@@ -385,16 +385,17 @@ Verbose:
 	|_|\___|\___|\__|\___|\___/ \__,_|\___|  CLI v2.1.1
 
 	[Environment]
-	Cache:  /Users/skygragon/.lc/
-	Config: /Users/skygragon/.lcconfig
+	Node                 v8.1.4
+	OS                   darwin 16.5.0
+	Cache:               /Users/skygragon/.lc/
+	Config:              /Users/skygragon/.lcconfig
 
 	[Configuration]
-	AUTO_LOGIN           true
-	COLOR_THEME          orange
-	ICON_THEME           default
-	LANG                 cpp
-	MAX_WORKERS          10
-	USE_COLOR            true
+	autologin            {"enable":false}
+	code                 {"editor":"vim","lang":"haha"}
+	color                {"enable":false,"theme":"default"}
+	icon                 {"theme":""}
+	network              {"concurrency":10}
 
 	[Themes]
 	Colors               blue,dark,default,orange,pink

lib/cli.js

@@ -12,14 +12,14 @@ var Plugin = require('./plugin');
 // global config < local config < cli params
 // Color is a tricky one so we manually handle it here.
 function initColor() {
-  chalk.enabled = config.USE_COLOR && chalk.enabled;
+  chalk.enabled = config.color.enable && chalk.enabled;
   chalk.init();
-  chalk.setTheme(config.COLOR_THEME);
+  chalk.setTheme(config.color.theme);
 }
 
 function initIcon() {
   icon.init();
-  icon.setTheme(config.ICON_THEME);
+  icon.setTheme(config.icon.theme);
 }
 
 function initLogLevel() {

lib/commands/plugin.js

@@ -39,12 +39,11 @@ var cmd = {
   }
 };
 
-var URL_PLUGIN = 'https://github.com/skygragon/leetcode-cli-plugins/raw/master/plugins/$name.js';
-
 function install(src) {
+  var config = require('../config');
   // assume to be a raw plugin name if not js file.
   if (path.extname(src) !== '.js') {
-    src = URL_PLUGIN.replace('$name', src);
+    src = config.sys.urls.plugin.replace('$name', src);
   }
 
   // copy to plugins folder

lib/commands/show.js

@@ -25,9 +25,9 @@ var cmd = {
     lang: {
       alias:    'l',
       type:     'string',
-      default:  config.LANG,
+      default:  config.code.lang,
       describe: 'Program language to use',
-      choices:  config.LANGS
+      choices:  config.sys.langs
     },
     extra: {
       alias:    'x',
@@ -96,7 +96,7 @@ cmd.handler = function(argv) {
       fs.writeFileSync(filename, code);
 
       if (argv.editor !== undefined) {
-        childProcess.spawn(argv.editor || config.EDITOR, [filename], {
+        childProcess.spawn(argv.editor || config.code.editor, [filename], {
           // in case your editor of choice is vim or emacs
           stdio: 'inherit'
         });

lib/commands/stat.js

@@ -23,7 +23,7 @@ var cmd = {
       type:     'string',
       default:  'all',
       describe: 'Show statistics on given tag',
-      choices:  ['all'].concat(config.CATEGORIES)
+      choices:  ['all'].concat(config.sys.categories)
     }
   }
 };

lib/commands/version.js

@@ -56,8 +56,9 @@ cmd.handler = function(argv) {
   printLine('Config', h.getConfigFile());
 
   log.info('\n[Configuration]');
-  _.each(config.getUserConfig(), function(v, k) {
-    printLine(k, v);
+  _.each(config.getAll(true), function(v, k) {
+    if (k === 'plugins') return;
+    printLine(k, JSON.stringify(v));
   });
 
   log.info('\n[Themes]');

lib/config.js

@@ -1,79 +1,91 @@
 var _ = require('underscore');
+var nconf = require('nconf');
 
 var h = require('./helper');
 
-// usually you don't wanna change those
-var DEFAULT_SYS_CONFIG = {
-  URL_BASE:            'https://leetcode.com',
-  URL_LOGIN:           'https://leetcode.com/accounts/login/',
-  URL_PROBLEMS:        'https://leetcode.com/api/problems/$category/',
-  URL_PROBLEM:         'https://leetcode.com/problems/$slug/description/',
-  URL_PROBLEM_DETAIL:  'https://leetcode.com/graphql',
-  URL_TEST:            'https://leetcode.com/problems/$slug/interpret_solution/',
-  URL_SUBMIT:          'https://leetcode.com/problems/$slug/submit/',
-  URL_SUBMISSIONS:     'https://leetcode.com/api/submissions/$slug',
-  URL_SUBMISSION:      'https://leetcode.com/submissions/detail/$id/',
-  URL_VERIFY:          'https://leetcode.com/submissions/detail/$id/check/',
-  URL_FAVORITES:       'https://leetcode.com/list/api/questions',
-  URL_FAVORITE_DELETE: 'https://leetcode.com/list/api/questions/$hash/$id',
+var DEFAULT_CONFIG = {
+  // usually you don't wanna change those
+  sys: {
+    categories: [
+      'algorithms',
+      'database',
+      'shell'
+    ],
+    langs: [
+      'bash',
+      'c',
+      'cpp',
+      'csharp',
+      'golang',
+      'java',
+      'javascript',
+      'kotlin',
+      'mysql',
+      'python',
+      'python3',
+      'ruby',
+      'scala',
+      'swift'
+    ],
+    urls: {
+      base:            'https://leetcode.com',
+      login:           'https://leetcode.com/accounts/login/',
+      problems:        'https://leetcode.com/api/problems/$category/',
+      problem:         'https://leetcode.com/problems/$slug/description/',
+      problem_detail:  'https://leetcode.com/graphql',
+      test:            'https://leetcode.com/problems/$slug/interpret_solution/',
+      submit:          'https://leetcode.com/problems/$slug/submit/',
+      submissions:     'https://leetcode.com/api/submissions/$slug',
+      submission:      'https://leetcode.com/submissions/detail/$id/',
+      verify:          'https://leetcode.com/submissions/detail/$id/check/',
+      favorites:       'https://leetcode.com/list/api/questions',
+      favorite_delete: 'https://leetcode.com/list/api/questions/$hash/$id',
+      plugin:          'https://github.com/skygragon/leetcode-cli-plugins/raw/master/plugins/$name.js'
+    }
+  },
 
-  LANGS: [
-    'bash',
-    'c',
-    'cpp',
-    'csharp',
-    'golang',
-    'java',
-    'javascript',
-    'kotlin',
-    'mysql',
-    'python',
-    'python3',
-    'ruby',
-    'scala',
-    'swift'
-  ],
-
-  CATEGORIES: [
-    'algorithms',
-    'database',
-    'shell'
-  ],
-
-  PLUGINS: {}
-};
-
-// but you will want change these
-var DEFAULT_USER_CONFIG = {
-  AUTO_LOGIN:  false,
-  COLOR_THEME: 'default',
-  EDITOR:      'vim',
-  ICON_THEME:  '',
-  LANG:        'cpp',
-  MAX_WORKERS: 10,
-  USE_COLOR:   true
+  // but you will want change these
+  autologin: {
+    enable: false
+  },
+  code: {
+    editor: 'vim',
+    lang:   'cpp'
+  },
+  color: {
+    enable: true,
+    theme:  'default'
+  },
+  icon: {
+    theme: ''
+  },
+  network: {
+    concurrency: 10
+  },
+  plugins: {}
 };
 
 function Config() {}
 
 Config.prototype.init = function() {
-  // check local config: ~/.lcconfig
-  var localConfig = JSON.parse(h.getFileData(h.getConfigFile())) || {};
-  _.extendOwn(this, this.getDefaultConfig());
-  _.extendOwn(this, localConfig);
-};
+  nconf.file(h.getConfigFile())
+    .defaults(DEFAULT_CONFIG);
 
-Config.prototype.getDefaultConfig = function() {
-  var cfg = {};
-  _.extendOwn(cfg, DEFAULT_SYS_CONFIG);
-  _.extendOwn(cfg, DEFAULT_USER_CONFIG);
-  return cfg;
+  var cfg = nconf.get();
+  // HACK: remove old style configs
+  for (var x in cfg) {
+    if (x === x.toUpperCase()) delete cfg[x];
+  }
+  delete DEFAULT_CONFIG.type;
+  delete cfg.type;
+
+  _.extendOwn(this, cfg);
 };
 
-Config.prototype.getUserConfig = function() {
-  return _.pick(this, function(v, k) {
-    return k in DEFAULT_USER_CONFIG;
-  });
+Config.prototype.getAll = function(useronly) {
+  var cfg = _.extendOwn({}, this);
+  if (useronly) delete cfg.sys;
+  return cfg;
 };
 
 module.exports = new Config();

lib/plugin.js

@@ -16,7 +16,7 @@ function Plugin(id, name, ver, desc, deps) {
 }
 
 Plugin.prototype.init = function() {
-  this.config = config.PLUGINS[this.name] || {};
+  this.config = config.plugins[this.name] || {};
   this.next = null;
 };