Commit b72d4d6

committed

move plugins' specific data into separate dirs.

* now leetcode/lintcode have different cache Signed-off-by: Eric Wang <skygragon@gmail.com>

1 parent 318983c commit b72d4d6Copy full SHA for b72d4d6

File tree

+32

-21

lines changed

+32

-21

lines changed

Lines changed: 18 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -52,9 +52,23 @@ function initLogLevel() {`
`52`	`52`	`log.setLevel(level);`
`53`	`53`	`}`
`54`	`54`
	`55`	`+function initPlugins(cb) {`
	`56`	`+ if (Plugin.init()) {`
	`57`	`+ Plugin.save();`
	`58`	`+ return cb();`
	`59`	`+ } else {`
	`60`	`+ Plugin.installMissings(function(e) {`
	`61`	`+ if (e) return cb(e);`
	`62`	`+ Plugin.init();`
	`63`	`+ return cb();`
	`64`	`+ });`
	`65`	`+ }`
	`66`	`+}`
	`67`	`+`
`55`	`68`	`var cli = {};`
`56`	`69`
`57`	`70`	`function runCommand() {`
	`71`	`+ //console.log(Plugin.getType())`
`58`	`72`	`var yargs = require('yargs');`
`59`	`73`	`h.width = yargs.terminalWidth();`
`60`	`74`	`yargs.commandDir('commands')`
`@@ -73,22 +87,15 @@ cli.run = function() {`
`73`	`87`	`});`
`74`	`88`
`75`	`89`	`config.init();`
`76`		`- cache.init();`
`77`	`90`
`78`	`91`	`initColor();`
`79`	`92`	`initIcon();`
`80`	`93`	`initLogLevel();`
`81`		`-`
`82`		`- if (Plugin.init()){`
`83`		`- Plugin.save();`
	`94`	`+initPlugins(function(e){`
	`95`	`+ if (e)returnlog.error(e);`
	`96`	`+ cache.init();`
`84`	`97`	`runCommand();`
`85`		`- } else {`
`86`		`- Plugin.installMissings(function(e) {`
`87`		`- if (e) return log.error(e);`
`88`		`- Plugin.init();`
`89`		`- runCommand();`
`90`		`- });`
`91`		`- }`
	`98`	`+ });`
`92`	`99`	`};`
`93`	`100`
`94`	`101`	`module.exports = cli;`

Lines changed: 7 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ const h = {};`
`53`	`53`	`h.KEYS = {`
`54`	`54`	`user: '../user',`
`55`	`55`	`stat: '../stat',`
`56`		`- plugins: '../plugins',`
	`56`	`+ plugins: '../../plugins',`
`57`	`57`	`problems: 'problems',`
`58`	`58`	`problem: p => p.fid + '.' + p.slug + '.' + p.category`
`59`	`59`	`};`
`@@ -186,8 +186,13 @@ h.getHomeDir = function() {`
`186`	`186`	`return path.join(this.getUserHomeDir(), '.lc');`
`187`	`187`	`};`
`188`	`188`
	`189`	`+h.getAppDir = function() {`
	`190`	`+ const config = require('./config');`
	`191`	`+ return path.join(this.getHomeDir(), config.app \|\| 'leetcode');`
	`192`	`+};`
	`193`	`+`
`189`	`194`	`h.getCacheDir = function() {`
`190`		`- return path.join(this.getHomeDir(), 'cache');`
	`195`	`+ return path.join(this.getAppDir(), 'cache');`
`191`	`196`	`};`
`192`	`197`
`193`	`198`	`h.getCodeDir = function(dir) {`

Lines changed: 0 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,11 +9,6 @@ var session = require('../session');`
`9`	`9`
`10`	`10`	`const plugin = new Plugin(50, 'cache', '', 'Plugin to provide local cache.');`
`11`	`11`
`12`		`-plugin.init = function() {`
`13`		`- Plugin.prototype.init.call(this);`
`14`		`- cache.init();`
`15`		`-};`
`16`		`-`
`17`	`12`	`plugin.getProblems = function(cb) {`
`18`	`13`	`const problems = cache.get(h.KEYS.problems);`
`19`	`14`	`if (problems) {`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,10 @@ function checkError(e, resp, expectedStatus) {`
`50`	`50`	`return e;`
`51`	`51`	`}`
`52`	`52`
	`53`	`+plugin.init = function() {`
	`54`	`+ config.app = 'leetcode';`
	`55`	`+}`
	`56`	`+`
`53`	`57`	`plugin.getProblems = function(cb) {`
`54`	`58`	`log.debug('running leetcode.getProblems');`
`55`	`59`	`let problems = [];`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -188,10 +188,10 @@ describe('helper', function() {`
`188`	`188`
`189`	`189`	`assert.equal(h.getUserHomeDir(), '/home/skygragon');`
`190`	`190`	`assert.equal(h.getHomeDir(), '/home/skygragon/.lc');`
`191`		`- assert.equal(h.getCacheDir(), '/home/skygragon/.lc/cache');`
`192`		`- assert.equal(h.getCacheFile('xxx'), '/home/skygragon/.lc/cache/xxx.json');`
	`191`	`+ assert.equal(h.getCacheDir(), '/home/skygragon/.lc/leetcode/cache');`
	`192`	`+ assert.equal(h.getCacheFile('xxx'), '/home/skygragon/.lc/leetcode/cache/xxx.json');`
`193`	`193`	`assert.equal(h.getConfigFile(), '/home/skygragon/.lc/config.json');`
`194`		`- assert.equal(h.getFilename('/home/skygragon/.lc/cache/xxx.json'), 'xxx');`
	`194`	`+ assert.equal(h.getFilename('/home/skygragon/.lc/leetcode/cache/xxx.json'), 'xxx');`
`195`	`195`
`196`	`196`	`process.env.HOME = '';`
`197`	`197`	`process.env.USERPROFILE = 'C:\\Users\\skygragon';`

Comments

(0)