move plugins' specific data into separate dirs.

* now leetcode/lintcode have different cache

Signed-off-by: Eric Wang <skygragon@gmail.com>

Author: skygragon

lib/cli.js

@@ -52,9 +52,23 @@ function initLogLevel() {
   log.setLevel(level);
 }
 
+function initPlugins(cb) {
+  if (Plugin.init()) {
+    Plugin.save();
+    return cb();
+  } else {
+    Plugin.installMissings(function(e) {
+      if (e) return cb(e);
+      Plugin.init();
+      return cb();
+    });
+  }
+}
+
 var cli = {};
 
 function runCommand() {
+  //console.log(Plugin.getType())
   var yargs = require('yargs');
   h.width = yargs.terminalWidth();
   yargs.commandDir('commands')
@@ -73,22 +87,15 @@ cli.run = function() {
   });
 
   config.init();
-  cache.init();
 
   initColor();
   initIcon();
   initLogLevel();
-
-  if (Plugin.init()) {
-    Plugin.save();
+  initPlugins(function(e) {
+    if (e) return log.error(e);
+    cache.init();
     runCommand();
-  } else {
-    Plugin.installMissings(function(e) {
-      if (e) return log.error(e);
-      Plugin.init();
-      runCommand();
-    });
-  }
+  });
 };
 
 module.exports = cli;

lib/helper.js

@@ -53,7 +53,7 @@ const h = {};
 h.KEYS = {
   user:     '../user',
   stat:     '../stat',
-  plugins:  '../plugins',
+  plugins:  '../../plugins',
   problems: 'problems',
   problem:  p => p.fid + '.' + p.slug + '.' + p.category
 };
@@ -186,8 +186,13 @@ h.getHomeDir = function() {
   return path.join(this.getUserHomeDir(), '.lc');
 };
 
+h.getAppDir = function() {
+  const config = require('./config');
+  return path.join(this.getHomeDir(), config.app || 'leetcode');
+};
+
 h.getCacheDir = function() {
-  return path.join(this.getHomeDir(), 'cache');
+  return path.join(this.getAppDir(), 'cache');
 };
 
 h.getCodeDir = function(dir) {

lib/plugins/cache.js

@@ -9,11 +9,6 @@ var session = require('../session');
 
 const plugin = new Plugin(50, 'cache', '', 'Plugin to provide local cache.');
 
-plugin.init = function() {
-  Plugin.prototype.init.call(this);
-  cache.init();
-};
-
 plugin.getProblems = function(cb) {
   const problems = cache.get(h.KEYS.problems);
   if (problems) {

lib/plugins/leetcode.js

@@ -50,6 +50,10 @@ function checkError(e, resp, expectedStatus) {
   return e;
 }
 
+plugin.init = function() {
+  config.app = 'leetcode';
+}
+
 plugin.getProblems = function(cb) {
   log.debug('running leetcode.getProblems');
   let problems = [];

test/test_helper.js

@@ -188,10 +188,10 @@ describe('helper', function() {
 
       assert.equal(h.getUserHomeDir(), '/home/skygragon');
       assert.equal(h.getHomeDir(), '/home/skygragon/.lc');
-      assert.equal(h.getCacheDir(), '/home/skygragon/.lc/cache');
-      assert.equal(h.getCacheFile('xxx'), '/home/skygragon/.lc/cache/xxx.json');
+      assert.equal(h.getCacheDir(), '/home/skygragon/.lc/leetcode/cache');
+      assert.equal(h.getCacheFile('xxx'), '/home/skygragon/.lc/leetcode/cache/xxx.json');
       assert.equal(h.getConfigFile(), '/home/skygragon/.lc/config.json');
-      assert.equal(h.getFilename('/home/skygragon/.lc/cache/xxx.json'), 'xxx');
+      assert.equal(h.getFilename('/home/skygragon/.lc/leetcode/cache/xxx.json'), 'xxx');
 
       process.env.HOME = '';
       process.env.USERPROFILE = 'C:\\Users\\skygragon';