Merge branch 'plugin'

Author: skygragon

.gitignore

@@ -37,4 +37,5 @@ jspm_packages
 .node_repl_history
 
 tmp/
+*.swp
 .DS_Store

lib/cache.js

@@ -5,6 +5,11 @@ var h = require('./helper');
 
 var cache = {};
 
+cache.init = function() {
+  var dir = h.getCacheDir();
+  if (!fs.existsSync(dir)) fs.mkdirSync(dir);
+};
+
 cache.get = function(k) {
   var fullpath = h.getCacheFile(k);
   if (!fs.existsSync(fullpath)) return null;

lib/chalk.js

@@ -47,7 +47,7 @@ chalk.wrap = function(pre, post) {
 
 chalk.init = function() {
   var h = require('./helper');
-  _.each(h.getDirData('colors'), function(f) {
+  _.each(h.getDirData(['colors']), function(f) {
     chalk.themes[f.name] = _.mapObject(f.data, function(v, k) {
       return chalk.use256 ? style.color.ansi256.hex(v) : style.color.ansi.hex(v);
     });

lib/cli.js

@@ -1,17 +1,17 @@
-var fs = require('fs');
-
 var _ = require('underscore');
 
-var h = require('./helper');
 var chalk = require('./chalk');
+var config = require('./config');
+var core = require('./core');
+var h = require('./helper');
 var icon = require('./icon');
 var log = require('./log');
-var config = require('./config');
+var Plugin = require('./plugin');
 
 // We are expecting a tier configuration like:
 // global config < local config < cli params
 // Color is a tricky one so we manually handle it here.
-function setColor() {
+function initColor() {
   // FIXME: delete this hack when supports-color handles it well.
   if (process.env.TERM_PROGRAM === 'iTerm.app') chalk.use256 = true;
 
@@ -20,12 +20,12 @@ function setColor() {
   chalk.setTheme(config.COLOR_THEME);
 }
 
-function setIcon() {
+function initIcon() {
   icon.init();
   icon.setTheme(config.ICON_THEME);
 }
 
-function setLogLevel() {
+function initLogLevel() {
   log.init();
 
   var level = 'INFO';
@@ -56,22 +56,16 @@ function setLogLevel() {
   log.setLevel(level);
 }
 
-function checkCache() {
-  var cacheDir = h.getCacheDir();
-
-  if (!fs.existsSync(cacheDir))
-    fs.mkdirSync(cacheDir);
-}
-
 var cli = {};
 
 cli.run = function() {
   config.init();
 
-  checkCache();
-  setColor();
-  setIcon();
-  setLogLevel();
+  initColor();
+  initIcon();
+  initLogLevel();
+
+  Plugin.init(core);
 
   process.stdout.on('error', function(e) {
     if (e.code === 'EPIPE') process.exit();

lib/commands/list.js

@@ -86,8 +86,12 @@ cmd.handler = function(argv) {
     }
 
     if (argv.tag) {
+      var tag = argv.tag;
+      // TODO: fill company/tags in problems
       problems = _.filter(problems, function(x) {
-        return x.category === argv.tag;
+        return x.category === tag ||
+               x.company === tag ||
+               (x.tags && x.tags.indexOf(tag) !== -1);
       });
     }
 

lib/commands/user.js

@@ -3,6 +3,7 @@ var prompt = require('prompt');
 var chalk = require('../chalk');
 var log = require('../log');
 var core = require('../core');
+var session = require('../session');
 
 var cmd = {
   command: 'user',
@@ -44,14 +45,14 @@ cmd.handler = function(argv) {
     });
   } else if (argv.logout) {
     // logout
-    user = core.logout(true);
+    user = core.logout(user, true);
     if (user)
       log.info('Successfully logout as', chalk.yellow(user.name));
     else
       log.fail('You are not login yet?');
   } else {
     // show current user
-    user = core.getUser();
+    user = session.getUser();
     if (user)
       log.info('You are now login as', chalk.yellow(user.name));
     else

lib/commands/version.js

@@ -4,6 +4,7 @@ var sprintf = require('sprintf-js').sprintf;
 var chalk = require('../chalk');
 var icon = require('../icon');
 var log = require('../log');
+var Plugin = require('../plugin');
 
 var cmd = {
   command: 'version',
@@ -61,6 +62,11 @@ cmd.handler = function(argv) {
   log.info('\n[Themes]');
   prettyLine('Colors', _.keys(chalk.themes));
   prettyLine('Icons', _.keys(icon.themes));
+
+  log.info('\n[Plugins]');
+  _.each(Plugin.plugins, function(p, k) {
+    prettyLine(p.name, 'v' + p.ver);
+  });
 };
 
 module.exports = cmd;

lib/core.js

@@ -5,165 +5,47 @@ var util = require('util');
 var _ = require('underscore');
 
 var log = require('./log');
-var cache = require('./cache');
-var config = require('./config');
-var client = require('./leetcode_client');
-var queue = require('./queue');
 var h = require('./helper');
+var Plugin = require('./plugin');
+var session = require('./session');
 
-var KEY_USER = '.user';
-var KEY_PROBLEMS = 'problems';
-
-function getkey(problem) {
-  return problem.id + '.' + problem.slug + '.' + problem.category;
-}
-
-function saveProblem(problem) {
-  // it would be better to leave specific problem cache being user
-  // independent, thus try to reuse existing cache as much as possible
-  // after changing user.
-  var p = _.omit(problem, ['locked', 'state', 'starred']);
-  return cache.set(getkey(p), p);
-}
-
-function saveUser(user) {
-  // when auto login enabled, have to save password to re-login later
-  // otherwise don't dump password for the sake of security.
-  var u = _.omit(user, config.AUTO_LOGIN ? [] : ['pass']);
-  cache.set(KEY_USER, u);
-}
-
-var core = {};
-
-core.getProblems = function(cb) {
-  var problems = cache.get(KEY_PROBLEMS);
-  if (problems) {
-    log.debug('loading from problems.json');
-    return cb(null, problems);
-  }
-
-  var user = this.getUser();
-  var KEY_TMP = '.tmp';
-
-  var doTask = function(category, taskDone) {
-    log.debug(category + ': running getProblems');
-    client.getProblems(category, user, function(e, problems) {
-      if (e) {
-        log.debug(category + ': failed to getProblems: ' + e.msg);
-      } else {
-        log.debug(category + ': getProblems got ' +
-            problems.length + ' problems');
-        problems = cache.get(KEY_TMP).concat(problems);
-        cache.set(KEY_TMP, problems);
-      }
-      return taskDone(e);
-    });
-  };
-
-  cache.set(KEY_TMP, []);
-  queue.run(config.CATEGORIES, doTask, function(e) {
-    if (e) return cb(e);
-
-    saveUser(user);
-    var problems = cache.get(KEY_TMP);
-    cache.set(KEY_PROBLEMS, problems);
-    cache.del(KEY_TMP);
-
-    return cb(null, problems);
-  });
-};
+var core = new Plugin('core', 'Core', '20170722', 'Plugins manager');
 
 core.getProblem = function(keyword, cb) {
   this.getProblems(function(e, problems) {
     if (e) return cb(e);
 
+    var problem;
     keyword = Number(keyword) || keyword;
 
-    var problem;
     if (keyword === undefined) {
-      log.debug('random select problem');
-      var user = core.getUser();
+      var user = session.getUser();
       // random select one that not AC-ed yet
       problems = _.filter(problems, function(x) {
         if (x.state === 'ac') return false;
         if (!user.paid && x.locked) return false;
         return true;
       });
-      problem = problems[_.random(problems.length - 1)];
+      if (problems.length > 0)
+        problem = problems[_.random(problems.length - 1)];
     } else {
       problem = _.find(problems, function(x) {
-        return x.id === keyword ||
-               x.name === keyword ||
-               x.slug === keyword;
+        return x.id === keyword || x.name === keyword || x.slug === keyword;
       });
     }
 
-    if (!problem)
-      return cb('Problem not found!');
-
-    var cachekey = getkey(problem);
-    var problemDetail = cache.get(cachekey);
-    if (problemDetail) {
-      log.debug('loading from ' + cachekey + '.json');
-      _.extendOwn(problem, problemDetail);
-      return cb(null, problem);
-    }
-
-    log.debug('running getProblem');
-    client.getProblem(core.getUser(), problem, function(e, problem) {
-      if (e) return cb(e);
-
-      saveProblem(problem);
-      return cb(null, problem);
-    });
+    if (!problem) return cb('Problem not found!');
+    core.next.getProblem(problem, cb);
   });
 };
 
-core.getSubmissions = function(problem, cb) {
-  log.debug('running getSubmissions');
-  client.getSubmissions(problem, cb);
-};
-
-core.getSubmission = function(submission, cb) {
-  log.debug('running getSubmission');
-  client.getSubmission(submission, cb);
-};
-
-core.testProblem = function(problem, cb) {
-  log.debug('running testProblem');
-  client.testProblem(problem, cb);
-};
-
-core.submitProblem = function(problem, cb) {
-  log.debug('running submitProblem');
-  client.submitProblem(problem, cb);
-};
-
-core.updateProblem = function(problem, kv) {
-  var problems = cache.get(KEY_PROBLEMS);
-  if (!problems) return false;
-
-  var oldProblem = _.find(problems, function(x) {
-    return x.id === problem.id;
-  });
-  if (!oldProblem) return false;
-
-  _.extend(oldProblem, kv);
-  _.extend(problem, kv);
-
-  var singleUpdated = saveProblem(problem);
-  var allUpdated = cache.set(KEY_PROBLEMS, problems);
-  return singleUpdated && allUpdated;
-};
-
 core.starProblem = function(problem, starred, cb) {
   if (problem.starred === starred) {
     log.debug('problem is already ' + (starred ? 'starred' : 'unstarred'));
     return cb(null, starred);
   }
 
-  log.debug('running starProblem');
-  client.starProblem(this.getUser(), problem, starred, cb);
+  core.next.starProblem(problem, starred, cb);
 };
 
 core.exportProblem = function(problem, f, codeOnly) {
@@ -189,7 +71,7 @@ core.exportProblem = function(problem, f, codeOnly) {
     var wrap = require('wordwrap')(79 - input.comment.line.length);
     input.desc = wrap(desc).split('\n');
 
-    var tpl = fs.readFileSync(path.resolve(__dirname, '../source.tpl'), 'utf-8');
+    var tpl = h.getFileData(path.resolve(__dirname, '../source.tpl'));
     output = _.template(tpl)(input);
   }
 
@@ -202,42 +84,4 @@ core.exportProblem = function(problem, f, codeOnly) {
   fs.writeFileSync(f, output);
 };
 
-core.login = function(user, cb) {
-  this.logout(false);
-  client.login(user, function(e, user) {
-    if (e) return cb(e);
-
-    saveUser(user);
-    log.debug('running getFavorites');
-    client.getFavorites(function(e, favorites) {
-      if (e) return cb(e);
-
-      // TODO: pick other useful values from favorites
-      var favorite = _.find(favorites.favorites.private_favorites, function(f) {
-        return f.name === 'Favorite';
-      });
-      user.hash = favorite.id_hash;
-
-      saveUser(user);
-      return cb(null, user);
-    });
-  });
-};
-
-core.logout = function(purge) {
-  var user = this.getUser();
-  if (purge) cache.del(KEY_USER);
-  // NOTE: need invalidate any user related cache
-  cache.del(KEY_PROBLEMS);
-  return user;
-};
-
-core.getUser = function() {
-  return cache.get(KEY_USER);
-};
-
-core.isLogin = function() {
-  return this.getUser() !== null;
-};
-
 module.exports = core;