refs #82: show frontend id in cli.

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

Author: skygragon

lib/commands/list.js

@@ -60,7 +60,7 @@ cmd.handler = function(argv) {
     const stat = {};
     for (let x of ['locked', 'starred', 'ac', 'notac', 'None', 'Easy', 'Medium', 'Hard']) stat[x] = 0;
 
-    problems = _.sortBy(problems, x => -x.id);
+    problems = _.sortBy(problems, x => -x.fid);
     for (let problem of problems) {
       stat[problem.level] = (stat[problem.level] || 0) + 1;
       stat[problem.state] = (stat[problem.state] || 0) + 1;
@@ -71,7 +71,7 @@ cmd.handler = function(argv) {
           (problem.starred ? chalk.yellow(icon.like) : icon.none),
           (problem.locked ? chalk.red(icon.lock) : icon.none),
           h.prettyState(problem.state),
-          problem.id,
+          problem.fid,
           problem.name,
           h.prettyLevel(sprintf('%-6s', problem.level)),
           problem.percent);

lib/commands/show.js

@@ -75,7 +75,7 @@ const cmd = {
 function genFileName(problem, opts) {
   const path = require('path');
   const params = [
-    problem.id,
+    problem.fid,
     problem.slug,
     '',
     h.langToExt(opts.lang)
@@ -139,7 +139,7 @@ function showProblem(problem, argv) {
     }
   }
 
-  log.printf('[%d] %s %s', problem.id, problem.name,
+  log.printf('[%d] %s %s', problem.fid, problem.name,
       (problem.starred ? chalk.yellow(icon.like) : icon.none));
   log.info();
   log.info(chalk.underline(problem.link));

lib/commands/star.js

@@ -35,7 +35,7 @@ cmd.handler = function(argv) {
     core.starProblem(problem, !argv.delete, function(e, starred) {
       if (e) return log.fail(e);
 
-      log.printf('[%d] %s %s', problem.id, problem.name,
+      log.printf('[%d] %s %s', problem.fid, problem.name,
           chalk.yellow(starred ? icon.like : icon.unlike));
 
       core.updateProblem(problem, {starred: starred});

lib/commands/stat.js

@@ -106,7 +106,7 @@ function showGraph(problems) {
 
   const graph = [];
   for (let problem of problems)
-    graph[problem.id] = ICONS[problem.state] || ICONS.none;
+    graph[problem.fid] = ICONS[problem.state] || ICONS.none;
 
   let line = [sprintf(' %03d', 0)];
   for (let i = 1, n = graph.length; i <= n; ++i) {

lib/commands/submission.js

@@ -59,14 +59,14 @@ function doTask(problem, queue, cb) {
     // - green: accepted, fresh download
     // - yellow: not ac-ed, fresh download
     // - white: existed already, skip download
-    log.printf('[%3d] %-60s %s', problem.id, problem.name,
+    log.printf('[%3d] %-60s %s', problem.fid, problem.name,
         (e ? chalk.red('ERROR: ' + (e.msg || e)) : msg));
     if (cb) cb(e);
   }
 
   if (argv.extra) {
     // have to get problem details, e.g. problem description.
-    core.getProblem(problem.id, function(e, problem) {
+    core.getProblem(problem.fid, function(e, problem) {
       if (e) return cb(e);
       exportSubmission(problem, argv, onTaskDone);
     });
@@ -92,7 +92,7 @@ function exportSubmission(problem, argv, cb) {
 
     const f = sprintf('%s/%d.%s.%s.%s%s',
         argv.outdir,
-        problem.id,
+        problem.fid,
         problem.slug,
         submission.id,
         submission.ac ? 'ac' : 'notac',

lib/commands/submit.js

@@ -66,7 +66,7 @@ cmd.handler = function(argv) {
 
       if (result.ok) {
         session.updateStat('ac', 1);
-        session.updateStat('ac.set', problem.id);
+        session.updateStat('ac.set', problem.fid);
         core.getSubmission({id: result.id}, function(e, submission) {
           if (e || !submission || !submission.distributionChart)
             return log.warn('Failed to get submission beat ratio.');

lib/core.js

@@ -89,7 +89,7 @@ core.getProblem = function(keyword, cb) {
 
     keyword = Number(keyword) || keyword;
     const problem = problems.find(function(x) {
-      return x.id === keyword || x.name === keyword || x.slug === keyword;
+      return x.fid === keyword || x.name === keyword || x.slug === keyword;
     });
     if (!problem) return cb('Problem not found!');
     core.next.getProblem(problem, cb);

lib/helper.js

@@ -54,7 +54,7 @@ h.KEYS = {
   user:     '../user',
   stat:     '../stat',
   problems: 'problems',
-  problem:  p => p.id + '.' + p.slug + '.' + p.category
+  problem:  p => p.fid + '.' + p.slug + '.' + p.category
 };
 
 h.isWindows = function() {

lib/plugins/leetcode.js

@@ -101,6 +101,7 @@ plugin.getCategoryProblems = function(category, cb) {
           return {
             state:    p.status || 'None',
             id:       p.stat.question_id,
+            fid:      p.stat.frontend_question_id,
             name:     p.stat.question__title,
             slug:     p.stat.question__title_slug,
             link:     config.sys.urls.problem.replace('$slug', p.stat.question__title_slug),

test/plugins/test_cache.js

@@ -18,10 +18,10 @@ const HOME = './tmp';
 
 describe('plugin:cache', function() {
   const PROBLEMS = [
-    {id: 0, name: 'name0', slug: 'slug0', starred: false, category: 'algorithms'},
-    {id: 1, name: 'name1', slug: 'slug1', starred: true, category: 'algorithms'}
+    {id: 0, fid: 0, name: 'name0', slug: 'slug0', starred: false, category: 'algorithms'},
+    {id: 1, fid: 1, name: 'name1', slug: 'slug1', starred: true, category: 'algorithms'}
   ];
-  const PROBLEM = {id: 0, slug: 'slug0', category: 'algorithms'};
+  const PROBLEM = {id: 0, fid: 0, slug: 'slug0', category: 'algorithms'};
 
   const NEXT = {};
 
@@ -125,7 +125,7 @@ describe('plugin:cache', function() {
       const ret = plugin.saveProblem(problem);
       assert.equal(ret, true);
       assert.deepEqual(cache.get('0.slug0.algorithms'),
-          {id: 0, slug: 'slug0', name: 'name0', category: 'algorithms'});
+          {id: 0, fid: 0, slug: 'slug0', name: 'name0', category: 'algorithms'});
     });
   }); // #saveProblem
 
@@ -140,8 +140,8 @@ describe('plugin:cache', function() {
       plugin.getProblems(function(e, problems) {
         assert.equal(e, null);
         assert.deepEqual(problems, [
-            {id: 0, name: 'name0', slug: 'slug0', value: 'value00', starred: false, category: 'algorithms'},
-            {id: 1, name: 'name1', slug: 'slug1', starred: true, category: 'algorithms'}
+            {id: 0, fid: 0, name: 'name0', slug: 'slug0', value: 'value00', starred: false, category: 'algorithms'},
+            {id: 1, fid: 1, name: 'name1', slug: 'slug1', starred: true, category: 'algorithms'}
         ]);
         done();
       });