merge from upstream

Author: libaoxi

lib/cache.js

@@ -9,6 +9,12 @@ cache.init = function() {
   file.mkdir(file.cacheDir());
 };
 
+cache.deleteAll = function () {
+  cache.list().forEach(value => {
+    cache.del(value.name);
+  })
+};
+
 cache.get = function(k) {
   const fullpath = file.cacheFile(k);
   if (!file.exist(fullpath)) return null;

lib/commands/list.js

@@ -14,34 +14,40 @@ const cmd = {
   desc:    'List questions',
   builder: function(yargs) {
     return yargs
-        .option('q', core.filters.query)
-        .option('s', {
-          alias:    'stat',
-          type:     'boolean',
-          default:  false,
-          describe: 'Show statistics of listed questions'
-        })
-        .option('t', core.filters.tag)
-        .option('x', {
-          alias:    'extra',
-          type:     'boolean',
-          default:  false,
-          describe: 'Show extra details: category, companies, tags.'
-        })
-        .option('c', core.filters.category)
-        .positional('keyword', {
-          type:     'string',
-          default:  '',
-          describe: 'Filter questions by keyword'
-        })
-        .example(chalk.yellow('leetcode list'), 'List all questions')
-        .example(chalk.yellow('leetcode list -x'), 'Show extra info of questions, e.g. tags')
-        .example('', '')
-        .example(chalk.yellow('leetcode list array'), 'List questions that has "array" in name')
-        .example(chalk.yellow('leetcode list -q eD'), 'List questions that with easy level and not done')
-        .example(chalk.yellow('leetcode list -t google'), 'List questions from Google company (require plugin)')
-        .example(chalk.yellow('leetcode list -t stack'), 'List questions realted to stack (require plugin)')
-        .example(chalk.yellow('leetcode list -c lcof'), 'List questions from category (require plugin)');
+      .option('q', core.filters.query)
+      .option('s', {
+        alias:    'stat',
+        type:     'boolean',
+        default:  false,
+        describe: 'Show statistics of listed questions'
+      })
+      .option('t', core.filters.tag)
+      .option('x', {
+        alias:    'extra',
+        type:     'boolean',
+        default:  false,
+        describe: 'Show extra details: category, companies, tags.'
+      })
+      .option('T', {
+        alias:    'dontTranslate',
+        type:     'boolean',
+        default:  false,
+        describe: 'Set to true to disable endpoint\'s translation',
+      })
+      .option('c', core.filters.category)
+      .positional('keyword', {
+        type:     'string',
+        default:  '',
+        describe: 'Filter questions by keyword'
+      })
+      .example(chalk.yellow('leetcode list'), 'List all questions')
+      .example(chalk.yellow('leetcode list -x'), 'Show extra info of questions, e.g. tags')
+      .example('', '')
+      .example(chalk.yellow('leetcode list array'), 'List questions that has "array" in name')
+      .example(chalk.yellow('leetcode list -q eD'), 'List questions that with easy level and not done')
+      .example(chalk.yellow('leetcode list -t google'), 'List questions from Google company (require plugin)')
+      .example(chalk.yellow('leetcode list -t stack'), 'List questions realted to stack (require plugin)')
+      .example(chalk.yellow('leetcode list -c lcof'), 'List questions from category (require plugin)');
   }
 };
 

lib/commands/show.js

@@ -57,6 +57,12 @@ const cmd = {
         default:  false,
         describe: 'Show extra question details in source code'
       })
+      .option('T', {
+        alias:    'dontTranslate',
+        type:     'boolean',
+        default:  false,
+        describe: 'Set to true to disable endpoint\'s translation',
+      })
       .positional('keyword', {
         type:     'string',
         default:  '',
@@ -175,7 +181,7 @@ cmd.handler = function(argv) {
   session.argv = argv;
   if (argv.keyword.length > 0) {
     // show specific one
-    core.getProblem(argv.keyword, function(e, problem) {
+    core.getProblem(argv.keyword, !argv.dontTranslate, function(e, problem) {
       if (e) return log.fail(e);
       showProblem(problem, argv);
     });
@@ -194,7 +200,7 @@ cmd.handler = function(argv) {
       if (problems.length === 0) return log.fail('Problem not found!');
 
       const problem = _.sample(problems);
-      core.getProblem(problem, function(e, problem) {
+      core.getProblem(problem, !argv.dontTranslate, function(e, problem) {
         if (e) return log.fail(e);
         showProblem(problem, argv);
       });

lib/commands/star.js

@@ -29,7 +29,8 @@ const cmd = {
 
 cmd.handler = function(argv) {
   session.argv = argv;
-  core.getProblem(argv.keyword, function(e, problem) {
+  // translation doesn't affect question lookup
+  core.getProblem(argv.keyword, true, function(e, problem) {
     if (e) return log.fail(e);
 
     core.starProblem(problem, !argv.delete, function(e, starred) {

lib/commands/submission.js

@@ -42,6 +42,12 @@ const cmd = {
         default:  false,
         describe: 'Show extra question details in submission code'
       })
+      .option('T', {
+        alias:    'dontTranslate',
+        type:     'boolean',
+        default:  false,
+        describe: 'Set to true to disable endpoint\'s translation',
+      })
       .positional('keyword', {
         type:     'string',
         default:  '',
@@ -69,7 +75,7 @@ function doTask(problem, queue, cb) {
 
   if (argv.extra) {
     // have to get problem details, e.g. problem description.
-    core.getProblem(problem.fid, function(e, problem) {
+    core.getProblem(problem.fid, !argv.dontTranslate, function(e, problem) {
       if (e) return cb(e);
       exportSubmission(problem, argv, onTaskDone);
     });
@@ -135,7 +141,7 @@ cmd.handler = function(argv) {
   if (!argv.keyword)
     return log.fail('missing keyword?');
 
-  core.getProblem(argv.keyword, function(e, problem) {
+  core.getProblem(argv.keyword, !argv.dontTranslate, function(e, problem) {
     if (e) return log.fail(e);
     q.addTask(problem).run();
   });

lib/commands/submit.js

@@ -49,7 +49,8 @@ cmd.handler = function(argv) {
 
   const meta = file.meta(argv.filename);
 
-  core.getProblem(meta.id, function(e, problem) {
+  // translation doesn't affect problem lookup
+  core.getProblem(meta.id, true, function(e, problem) {
     if (e) return log.fail(e);
 
     problem.file = argv.filename;

lib/commands/test.js

@@ -60,7 +60,7 @@ function runTest(argv) {
 
   const meta = file.meta(argv.filename);
 
-  core.getProblem(meta.id, function(e, problem) {
+  core.getProblem(meta.id, true, function(e, problem) {
     if (e) return log.fail(e);
 
     if (!problem.testable)

lib/core.js

@@ -67,7 +67,7 @@ const QUERY_HANDLERS = {
 };
 
 core.filterProblems = function(opts, cb) {
-  this.getProblems(function(e, problems) {
+  this.getProblems(!opts.dontTranslate, function(e, problems) {
     if (e) return cb(e);
     for (const q of (opts.query || '').split('')) {
       const f = QUERY_HANDLERS[q];
@@ -93,11 +93,11 @@ core.filterProblems = function(opts, cb) {
   });
 };
 
-core.getProblem = function(keyword, cb) {
+core.getProblem = function(keyword, needTranslation, cb) {
   if (keyword.id)
-    return core.next.getProblem(keyword, cb);
+    return core.next.getProblem(keyword, needTranslation, cb);
 
-  this.getProblems(function(e, problems) {
+  this.getProblems(needTranslation, function(e, problems) {
     if (e) return cb(e);
 
     keyword = Number(keyword) || keyword;
@@ -106,7 +106,7 @@ core.getProblem = function(keyword, cb) {
       return x.id + '' === keyword + '' || x.fid + '' === keyword + '' || x.fid + '' === metaFid + '' || x.name === keyword || x.slug === keyword;
     });
     if (!problem) return cb('Problem not found!');
-    core.next.getProblem(problem, cb);
+    core.next.getProblem(problem, needTranslation, cb);
   });
 };
 

lib/helper.js

@@ -52,11 +52,12 @@ const LANGS = [
 const h = {};
 
 h.KEYS = {
-  user:     '../user',
-  stat:     '../stat',
-  plugins:  '../../plugins',
-  problems: 'problems',
-  problem:  p => p.fid + '.' + p.slug + '.' + p.category
+  user:        '../user',
+  stat:        '../stat',
+  plugins:     '../../plugins',
+  problems:    'problems',
+  translation: 'translationConfig',
+  problem:     p => p.id + '.' + p.slug + '.' + p.category
 };
 
 h.prettyState = function(state) {

lib/plugins/cache.js

@@ -9,22 +9,37 @@ var session = require('../session');
 
 const plugin = new Plugin(50, 'cache', '', 'Plugin to provide local cache.');
 
-plugin.getProblems = function(cb) {
+// this function will clear all caches if needTranslation is different than stored
+// it will also store the new needTranslation into cache automatically
+function clearCacheIfTchanged(needTranslation) {
+  const translationConfig = cache.get(h.KEYS.translation);
+  if (!translationConfig || translationConfig['useEndpointTranslation'] != needTranslation) {
+    // cache doesn't have the key => old cache version, need to update
+    // or cache does have the key but it contains a different value
+    cache.deleteAll();
+    cache.set(h.KEYS.translation, { useEndpointTranslation: needTranslation });
+    log.debug('cache cleared: -T option changed');
+  }
+}
+
+plugin.getProblems = function (needTranslation, cb) {
+  clearCacheIfTchanged(needTranslation);
   const problems = cache.get(h.KEYS.problems);
   if (problems) {
     log.debug('cache hit: problems.json');
     return cb(null, problems);
   }
 
-  plugin.next.getProblems(function(e, problems) {
+  plugin.next.getProblems(needTranslation, function(e, problems) {
     if (e) return cb(e);
 
     cache.set(h.KEYS.problems, problems);
     return cb(null, problems);
   });
 };
 
-plugin.getProblem = function(problem, cb) {
+plugin.getProblem = function (problem, needTranslation, cb) {
+  clearCacheIfTchanged(needTranslation);
   const k = h.KEYS.problem(problem);
   const _problem = cache.get(k);
   if (_problem) {
@@ -42,7 +57,7 @@ plugin.getProblem = function(problem, cb) {
     }
   }
 
-  plugin.next.getProblem(problem, function(e, _problem) {
+  plugin.next.getProblem(problem, needTranslation, function(e, _problem) {
     if (e) return cb(e);
 
     plugin.saveProblem(_problem);