Refactor: move utilities to helper.js

* remove unnecessary async getUser()

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

Author: skygragon

lib/commands/list.js

@@ -1,7 +1,8 @@
 var sprintf = require('sprintf-js').sprintf,
     _ = require('underscore');
 
-var core = require('../core');
+var core = require('../core'),
+    h = require('../helper');
 
 var cmd = {
   command: 'list [--cached|-c] [--undone|-D]',
@@ -18,14 +19,6 @@ var cmd = {
   }
 };
 
-function prettyState(state) {
-  switch(state) {
-    case 'ac':    return '✔'; break;
-    case 'notac': return '✘'; break;
-    default:      return ' '; break;
-  };
-}
-
 cmd.handler = function(argv) {
   core.getProblems(function(e, problems){
     if (e) return console.log('ERROR:', e);
@@ -38,7 +31,7 @@ cmd.handler = function(argv) {
 
     problems.forEach(function(problem){
       console.log(sprintf('%s [%3d] %-60s %-6s (%s)',
-            prettyState(problem.state), problem.id,
+            h.prettyState(problem.state), problem.id,
             problem.name, problem.level, problem.percent));
     });
   });

lib/commands/user.js

@@ -38,18 +38,18 @@ cmd.handler = function(argv) {
     });
   } else if (argv.logout) {
     // logout
-    core.logout(null, function(e, user){
-      if (e) return console.log('Logout failed:', e);
-
+    var user = core.logout(null);
+    if (user)
       console.log('Successfully logout as', user.name);
-    });
+    else
+      console.log('You are not login yet?');
   } else {
     // show current user
-    core.getUser(function(e, user){
-      if (e) return console.log('ERROR:', e);
-
+    var user = core.getUser();
+    if (user)
       console.log('You are now login as', user.name);
-    });
+    else
+      console.log('You are not login yet?');
   }
 }
 

lib/core.js

@@ -45,21 +45,13 @@ core.login = function(user, cb) {
   });
 };
 
-core.logout = function(user, cb) {
-  user = cache.get('.user');
-  if (!cache.del('.user')) return cb('You are not login yet?');
-
-  return cb(null, user);
-};
-
-core.getUser = function(cb) {
-  var user = this.getUserSync();
-  if (!user) return cb('User not found! Please login first.');
-
-  return cb(null, user);
+core.logout = function(user) {
+  user = this.getUser();
+  if (user) cache.del('.user');
+  return user;
 };
 
-core.getUserSync = function() { return cache.get('.user'); };
-core.isLogin = function() { return this.getUserSync() != null; };
+core.getUser = function() { return cache.get('.user'); };
+core.isLogin = function() { return this.getUser() != null; };
 
 module.exports = core;

lib/helper.js

@@ -0,0 +1,23 @@
+var h = {};
+
+h.prettyState = function(state) {
+  switch(state) {
+    case 'ac':    return '✔'; break;
+    case 'notac': return '✘'; break;
+    default:      return ' '; break;
+  };
+}
+
+h.getSetCookieValue = function(resp, key) {
+  var cookies = resp.headers['set-cookie'];
+  if (!cookies) return null;
+  for (var i=0; i<cookies.length; ++i) {
+    var sections = cookies[i].split(';');
+    for (var j=0; j<sections.length; ++j) {
+      var kv = sections[j].trim().split('=');
+      if (kv[0] == key) return kv[1];
+    }
+  }
+}
+
+module.exports = h;

lib/leetcode_client.js

@@ -2,13 +2,14 @@ var cheerio = require('cheerio'),
     request = require('request'),
     _ = require('underscore');
 
-var config = require('./config');
+var config = require('./config'),
+    h = require('./helper');
 
 function makeOpts(url) {
   var opts = { url: url, headers: {} };
   var core = require('./core');
   if (core.isLogin()) {
-    var user = core.getUserSync();
+    var user = core.getUser();
     opts.headers['Cookie'] = 'PHPSESSID='+user.session_id+';csrftoken='+user.session_csrf+';';
   }
   return opts;
@@ -60,24 +61,12 @@ leetcode_client.getProblem = function(problem, cb) {
   });
 };
 
-function getCookie(resp, name) {
-  var cookies = resp.headers['set-cookie'];
-  if (!cookies) return null;
-  for (var i=0; i<cookies.length; ++i) {
-    var sections = cookies[i].split(';');
-    for (var j=0; j<sections.length; ++j) {
-      var kv = sections[j].trim().split('=');
-      if (kv[0] == name) return kv[1];
-    }
-  }
-}
-
 leetcode_client.login = function(user, cb) {
   request(config.LOGIN_URL, function(e, resp, body){
     if (e) return cb(e);
     if (resp.statusCode != 200) return cb('HTTP failed:' + resp.statusCode);
 
-    user.csrf = getCookie(resp, 'csrftoken');
+    user.csrf = h.getSetCookieValue(resp, 'csrftoken');
 
     var opts = {
       url: config.LOGIN_URL,
@@ -96,9 +85,9 @@ leetcode_client.login = function(user, cb) {
       if (e) return cb(e);
       if (resp.statusCode != 302) return cb('HTTP failed:' + resp.statusCode);
 
-      user.session_csrf = getCookie(resp, 'csrftoken');
-      user.session_id = getCookie(resp, 'PHPSESSID');
-      user.name = getCookie(resp, 'messages').match('Successfully signed in as ([^.]*)')[1];
+      user.session_csrf = h.getSetCookieValue(resp, 'csrftoken');
+      user.session_id = h.getSetCookieValue(resp, 'PHPSESSID');
+      user.name = h.getSetCookieValue(resp, 'messages').match('Successfully signed in as ([^.]*)')[1];
 
       return cb(null, user);
     });