Show tag/lang badges in show -x.

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

Author: skygragon

Diff for: lib/chalk.js

@@ -50,12 +50,25 @@ chalk.wrap = function(pre, post) {
   return f;
 };
 
+function bgName(s) { return 'bg' + s[0].toUpperCase() + s.substr(1); }
+
 chalk.init = function() {
-  var h = require('./helper');
-  _.each(h.getCodeDirData('colors'), function(f) {
-    chalk.themes[f.name] = _.mapObject(f.data, function(v, k) {
-      return chalk.use256 ? style.color.ansi256.hex(v) : style.color.ansi.hex(v);
+  _.each(require('./helper').getCodeDirData('colors'), function(f) {
+    var o = {};
+    _.pairs(f.data).forEach(function(x) {
+      var k = x[0];
+      var v = x[1];
+      var bgK = bgName(k);
+
+      if (chalk.use256) {
+        o[k] = style.color.ansi256.hex(v);
+        o[bgK] = style.bgColor.ansi256.hex(v);
+      } else {
+        o[k] = style.color.ansi.hex(v);
+        o[bgK] = style.bgColor.ansi.hex(v);
+      }
     });
+    chalk.themes[f.name] = o;
   });
 
   _.chain(['black', 'blue', 'cyan', 'gray', 'green', 'magenta', 'red', 'white', 'yellow'])
@@ -66,6 +79,13 @@ chalk.init = function() {
       },
       configurable: true
     });
+    var bgcolor = bgName(color);
+    Object.defineProperty(chalk, bgcolor, {
+      get: function() {
+        return chalk.wrap(chalk.theme[bgcolor], style.bgColor.close);
+      },
+      configurable: true
+    });
   });
 
   _.chain(['bold', 'dim', 'italic', 'inverse', 'strikethrough', 'underline'])

Diff for: lib/commands/show.js

@@ -75,10 +75,15 @@ function genFileName(problem, lang) {
 }
 
 function showProblem(problem, argv) {
+  var taglist = [problem.category]
+    .concat(problem.companies || [])
+    .concat(problem.tags || [])
+    .map(function(x) { return h.badge(x, 'blue'); })
+    .join(' ');
   var langlist = problem.templates
-    .map(function(x) { return x.value; })
+    .map(function(x) { return h.badge(x.value, 'yellow'); })
     .sort()
-    .join(', ');
+    .join(' ');
 
   var code;
   var needcode = argv.gen || argv.codeonly;
@@ -122,6 +127,12 @@ function showProblem(problem, argv) {
       (problem.starred ? chalk.yellow(icon.like) : icon.none));
   log.info();
   log.info(chalk.underline(problem.link));
+  if (argv.extra) {
+    log.info();
+    log.info('Tags:  ' + taglist);
+    log.info();
+    log.info('Langs: ' + langlist);
+  }
 
   log.info();
   log.printf('* %s', problem.category);
@@ -135,7 +146,6 @@ function showProblem(problem, argv) {
     log.printf('* Total Submissions: %s', problem.totalSubmit);
   if (problem.testable && problem.testcase)
     log.printf('* Testcase Example:  %s', chalk.yellow(util.inspect(problem.testcase)));
-  log.printf('* Avail Languages:   %s', langlist);
 
   log.info();
   log.info(problem.desc);

Diff for: lib/helper.js

@@ -252,4 +252,22 @@ h.spin = function(s) {
   return ora(require('./chalk').gray(s)).start();
 };
 
+var COLORS = {
+  blue:    {fg: 'white', bg: 'bgBlue'},
+  gray:    {fg: 'white', bg: 'bgGray'},
+  green:   {fg: 'black', bg: 'bgGreen'},
+  magenta: {fg: 'white', bg: 'bgMagenta'},
+  red:     {fg: 'white', bg: 'bgRed'},
+  yellow:  {fg: 'black', bg: 'bgYellow'}
+};
+h.badge = function(s, color) {
+  s = ' ' + s + ' ';
+  if (color === 'random')
+    color = _.chain(COLORS).keys().sample().value();
+  var c = COLORS[color || 'blue'];
+
+  var chalk = require('./chalk');
+  return chalk[c.fg][c.bg](s);
+};
+
 module.exports = h;