refs #35: refactor to support icon themes.

Signed-off-by: Eric Wang <[email protected]>

Author: skygragon

icons/default.json

@@ -0,0 +1,8 @@
+{
+    "yes":    "✔",
+    "no":     "✘",
+    "like":   "★",
+    "unlike": "☆",
+    "lock":   "🔒",
+    "none":   " "
+}

lib/cli.js

@@ -6,11 +6,12 @@ var _ = require('underscore');
 
 var chalk = require('./chalk');
 var config = require('./config');
+var icon = require('./icon');
 
 // 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 setColorMode() {
+function setColor() {
   // FIXME: delete this hack when supports-color handles it well.
   if (process.env.TERM_PROGRAM === 'iTerm.app') chalk.use256 = true;
 
@@ -19,6 +20,11 @@ function setColorMode() {
   chalk.setTheme(config.COLOR_THEME);
 }
 
+function setIcon() {
+  icon.init();
+  icon.setTheme(config.ICON_THEME);
+}
+
 function setLogLevel() {
   var level = log.levels.INFO;
   if (process.argv.indexOf('-v') >= 0) level = log.levels.DEBUG;
@@ -71,7 +77,8 @@ cli.run = function() {
   config.init();
 
   checkCache();
-  setColorMode();
+  setColor();
+  setIcon();
   setLogLevel();
 
   process.stdout.on('error', function(e) {

lib/commands/list.js

@@ -5,6 +5,7 @@ var log = require('loglevel');
 var chalk = require('../chalk');
 var core = require('../core');
 var h = require('../helper');
+var icon = require('../icon');
 
 var cmd = {
   command: 'list [keyword]',
@@ -96,8 +97,8 @@ cmd.handler = function(argv) {
       if (problem.starred) ++stat.starred;
 
       log.info(sprintf('%s %s %s [%3d] %-60s %-6s (%.2f %%)',
-            (problem.starred ? chalk.yellow('★') : ' '),
-            (problem.locked ? '🔒' : ' '),
+            (problem.starred ? chalk.yellow(icon.like) : icon.none),
+            (problem.locked ? chalk.red(icon.lock) : icon.none),
             h.prettyState(problem.state),
             problem.id,
             problem.name,

lib/commands/show.js

@@ -9,6 +9,7 @@ var chalk = require('../chalk');
 var config = require('../config');
 var core = require('../core');
 var h = require('../helper');
+var icon = require('../icon');
 
 var cmd = {
   command: 'show <keyword>',
@@ -79,7 +80,7 @@ cmd.handler = function(argv) {
       log.info(sprintf('[%d] %s %s\t%s\n',
             problem.id,
             problem.name,
-            (problem.starred ? chalk.yellow('★') : ' '),
+            (problem.starred ? chalk.yellow(icon.like) : ' '),
             fileinfo));
       log.info(sprintf('%s\n', chalk.underline(problem.link)));
       log.info(sprintf('* %s (%.2f%%)', problem.level, problem.percent));

lib/commands/star.js

@@ -3,6 +3,7 @@ var sprintf = require('sprintf-js').sprintf;
 
 var chalk = require('../chalk');
 var core = require('../core');
+var icon = require('../icon');
 
 var cmd = {
   command: 'star <keyword>',
@@ -27,7 +28,7 @@ cmd.handler = function(argv) {
       log.info(sprintf('[%d] %s %s',
             problem.id,
             problem.name,
-            chalk.yellow(starred ? '★' : '☆')));
+            chalk.yellow(starred ? icon.like : icon.unlike)));
 
       core.updateProblem(problem, {starred: starred});
     });

lib/config.js

@@ -18,9 +18,10 @@ var DEFAULT_CONFIG = {
 
   // but you will want change these
   LANG:        'cpp', // avail: [c,cpp,csharp,golang,java,javascript,python,ruby,swift]
+  AUTO_LOGIN:  false,
   USE_COLOR:   true,
   COLOR_THEME: 'default',
-  AUTO_LOGIN:  false,
+  ICON_THEME:  'default',
   MAX_WORKERS: 10
 };
 

lib/helper.js

@@ -15,9 +15,10 @@ h.prettyState = function(state) {
 
 h.prettyText = function(text, yesNo) {
   var chalk = require('./chalk');
+  var icon = require('./icon');
   switch (yesNo) {
-    case true:  return chalk.green('✔' + text);
-    case false: return chalk.red('✘' + text);
+    case true:  return chalk.green(icon.yes + text);
+    case false: return chalk.red(icon.no + text);
     default:    return text;
   }
 };

lib/icon.js

@@ -0,0 +1,26 @@
+var _ = require('underscore');
+
+var icons = {
+  yes:    '✔',
+  no:     '✘',
+  like:   '★',
+  unlike: '☆',
+  lock:   '🔒',
+  none:   ' ',
+
+  themes: []
+};
+
+icons.setTheme = function(name) {
+  var theme = this.themes[name] || this.themes.default || {};
+  _.extendOwn(this, theme);
+};
+
+icons.init = function() {
+  var h = require('./helper');
+  _.each(h.getDirData('icons'), function(f) {
+    icons.themes[f.name] = f.data;
+  });
+};
+
+module.exports = icons;