Support unstar in 'star' command.

* also update cache when succeed.

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

Author: skygragon

lib/commands/list.js

@@ -18,7 +18,7 @@ var cmd = {
       alias:    'q',
       type:     'string',
       describe: 'Filter problems by conditions:\n' +
-                'e(easy),m(medium),h(hard),d(done),l(locked),f(favor)\n' +
+                'e(easy),m(medium),h(hard),d(done),l(locked),s(starred)\n' +
                 'Uppercase means negative, e.g. D(not done)'
     },
     stat: {
@@ -41,8 +41,8 @@ function byLocked(x, q) {
   return x.locked;
 }
 
-function byFavor(x, q) {
-  return x.favor;
+function byStarred(x, q) {
+  return x.starred;
 }
 
 var QUERY_HANDLERS = {
@@ -56,8 +56,8 @@ var QUERY_HANDLERS = {
   L: _.negate(byLocked),
   d: byStateAC,
   D: _.negate(byStateAC),
-  f: byFavor,
-  F: _.negate(byFavor)
+  s: byStarred,
+  S: _.negate(byStarred)
 };
 
 cmd.handler = function(argv) {
@@ -81,15 +81,15 @@ cmd.handler = function(argv) {
       });
     }
 
-    var stat = {locked: 0, favor: 0};
+    var stat = {locked: 0, starred: 0};
     problems.forEach(function(problem) {
       stat[problem.level] = (stat[problem.level] || 0) + 1;
       stat[problem.state] = (stat[problem.state] || 0) + 1;
       if (problem.locked) ++stat.locked;
-      if (problem.favor) ++stat.favor;
+      if (problem.starred) ++stat.starred;
 
       log.info(sprintf('%s %s %s [%3d] %-60s %-6s (%.2f %%)',
-            (problem.favor ? chalk.yellow('★') : ' '),
+            (problem.starred ? chalk.yellow('★') : ' '),
             (problem.locked ? '🔒' : ' '),
             h.prettyState(problem.state),
             problem.id,
@@ -100,11 +100,11 @@ cmd.handler = function(argv) {
 
     if (argv.stat) {
       log.info();
-      log.info(sprintf('  All:  %-9d Listed: %-9d', all, problems.length));
-      log.info(sprintf('  Lock: %-9d Favor:  %-9d', stat.locked, stat.favor));
-      log.info(sprintf('  AC:   %-9d Not-AC: %-9d New:  %-9d',
+      log.info(sprintf('  All:    %-9d Listed:  %-9d', all, problems.length));
+      log.info(sprintf('  Locked: %-9d Starred: %-9d', stat.locked, stat.starred));
+      log.info(sprintf('  Accept: %-9d Not-AC:  %-9d New:  %-9d',
             (stat.ac || 0), (stat.notac || 0), (stat.None || 0)));
-      log.info(sprintf('  Easy: %-9d Medium: %-9d Hard: %-9d',
+      log.info(sprintf('  Easy:   %-9d Medium:  %-9d Hard: %-9d',
             (stat.Easy || 0), (stat.Medium || 0), (stat.Hard || 0)));
     }
   });

lib/commands/show.js

@@ -49,7 +49,7 @@ cmd.handler = function(argv) {
     log.info(sprintf('[%d] %s %s\t%s\n',
           problem.id,
           problem.name,
-          (problem.favor ? chalk.yellow('★') : ' '),
+          (problem.starred ? chalk.yellow('★') : ' '),
           msg));
     log.info(sprintf('%s\n', chalk.underline(problem.link)));
     log.info(sprintf('* %s (%.2f%%)', problem.level, problem.percent));

lib/commands/star.js

@@ -1,18 +1,35 @@
+var chalk = require('chalk');
 var log = require('loglevel');
+var sprintf = require('sprintf-js').sprintf;
+
 var core = require('../core');
-var h = require('../helper');
 
 var cmd = {
   command: 'star <keyword>',
-  desc:    'star problem by name or index'
+  desc:    'Star problem by name or index',
+  builder: {
+    delete: {
+      alias:    'd',
+      type:     'boolean',
+      describe: 'Unstar the problem',
+      default:  false
+    }
+  }
 };
 
 cmd.handler = function(argv) {
   core.getProblem(argv.keyword, function(e, problem) {
     if (e) return log.fail(e);
-    core.starProblem(problem, function(e) {
+
+    core.starProblem(problem, !argv.delete, function(e, starred) {
       if (e) return log.fail(e);
-      log.info(h.prettyText(' Starred', true));
+
+      log.info(sprintf('[%d] %s %s',
+            problem.id,
+            problem.name,
+            chalk.yellow(starred ? '★' : '☆')));
+
+      core.updateProblem(problem, {starred: starred});
     });
   });
 };

lib/core.js

@@ -1,4 +1,5 @@
 var _ = require('underscore');
+var log = require('loglevel');
 
 var cache = require('./cache');
 var config = require('./config');
@@ -8,7 +9,10 @@ var core = {};
 
 core.getProblems = function(cb) {
   var cached = cache.get('all');
-  if (cached) return cb(null, cached);
+  if (cached) {
+    log.debug('loading from all.json');
+    return cb(null, cached);
+  }
 
   client.getProblems(function(e, problems) {
     if (e) return cb(e);
@@ -31,7 +35,10 @@ core.getProblem = function(keyword, cb) {
       return cb('Problem not found!');
 
     var cached = cache.get(problem.key);
-    if (cached) return cb(null, cached);
+    if (cached) {
+      log.debug('loading from ' + problem.key + '.json');
+      return cb(null, cached);
+    }
 
     client.getProblem(problem, function(e, problem) {
       if (e) return cb(e);
@@ -68,11 +75,20 @@ core.updateProblem = function(problem, kv) {
   if (!oldProblem) return false;
 
   _.extend(oldProblem, kv);
-  return cache.set('all', problems);
+  _.extend(problem, kv);
+
+  var singleUpdated = cache.set(problem.key, problem);
+  var allUpdated = cache.set('all', problems);
+  return singleUpdated && allUpdated;
 };
 
-core.starProblem = function(problem, cb) {
-  client.starProblem(problem, cb);
+core.starProblem = function(problem, starred, cb) {
+  if (problem.starred === starred) {
+    log.debug('problem is already ' + (starred ? 'starred' : 'unstarred'));
+    return cb(null, starred);
+  }
+
+  client.starProblem(problem, starred, cb);
 };
 
 core.login = function(user, cb) {

lib/leetcode_client.js

@@ -100,7 +100,7 @@ leetcodeClient.getProblems = function(cb) {
             locked:  p.paid_only,
             percent: p.stat.total_acs * 100 / p.stat.total_submitted,
             level:   h.levelToName(p.difficulty.level),
-            favor:   p.is_favor
+            starred: p.is_favor
           };
         });
 
@@ -315,9 +315,9 @@ leetcodeClient.submitProblem = function(problem, cb) {
   });
 };
 
-leetcodeClient.starProblem = function(problem, cb) {
+leetcodeClient.starProblem = function(problem, starred, cb) {
   var opts = makeOpts(config.URL_STAR);
-  opts.method = 'POST';
+  opts.method = (starred ? 'POST' : 'DELETE');
   opts.headers.Origin = config.URL_BASE;
   opts.headers.Referer = problem.link;
   opts.headers['X-Requested-With'] = 'XMLHttpRequest';
@@ -326,7 +326,9 @@ leetcodeClient.starProblem = function(problem, cb) {
 
   requestWithReLogin(opts, function(e, resp, body) {
     e = checkError(e, resp, 200);
-    cb(e);
+    if (e) return cb(e);
+
+    cb(null, body.is_favor);
   });
 };
 

test/test_leetcode_client.js

@@ -268,8 +268,9 @@ describe('leetcode_client', function() {
         .post('/problems/favor/')
         .reply(200, '{"is_favor": true}');
 
-      client.starProblem(problem, function(e) {
+      client.starProblem(problem, true, function(e, starred) {
         assert.equal(e, null);
+        assert.equal(starred, true);
         done();
       });
     });