Simplify show command.

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

Author: skygragon

docs/commands.md

@@ -156,8 +156,7 @@ Display problem details. With `-g`/`-l`/`-x`, the code template could be auto ge
 
 * `-g` to generate source file.
 * `-x` to add problem description in the generated source file.
-* `-t` to show code template.
-* `-d` to show problem description.
+* `-c` to only show code template.
 * `-l` to choose programming language. (Depends on which langs are provided on leetcode)
 	* bash
 	* c
@@ -209,7 +208,7 @@ Display problem details. With `-g`/`-l`/`-x`, the code template could be auto ge
 
 Only show the code template:
 
-	$ leetcode show -t --no-desc 1
+	$ leetcode show -c 1
 	class Solution {
 	public:
 		vector<int> twoSum(vector<int>& nums, int target) {

lib/commands/show.js

@@ -20,7 +20,7 @@ var cmd = {
       alias:    'g',
       type:     'boolean',
       default:  false,
-      describe: 'Generate source file from template'
+      describe: 'Generate source file from code template'
     },
     lang: {
       alias:    'l',
@@ -35,17 +35,11 @@ var cmd = {
       default:  false,
       describe: 'Provide extra problem details in generated file'
     },
-    desc: {
-      alias:    'd',
-      type:     'boolean',
-      default:  true,
-      describe: 'Show problem description'
-    },
-    template: {
-      alias:    't',
+    codeonly: {
+      alias:    'c',
       type:     'boolean',
       default:  false,
-      describe: 'Show code template'
+      describe: 'Show code template only'
     },
     editor: {
       alias:    'e',
@@ -55,72 +49,75 @@ var cmd = {
   }
 };
 
+function genFileName(problem, lang) {
+  // try to use a new filename to avoid overwrite by mistake
+  var name = problem.id + '.' + problem.slug + h.langToExt(lang);
+  var i = 0;
+  while (fs.existsSync(name))
+    name = problem.id + '.' + problem.slug + '.' + (i++) + h.langToExt(lang);
+  return name;
+}
+
 cmd.handler = function(argv) {
   session.argv = argv;
   core.getProblem(argv.keyword, function(e, problem) {
     if (e) return log.fail(e);
 
-    var template = _.find(problem.templates, function(x) {
-      return x.value === argv.lang;
-    });
-    if (!template && (argv.template || argv.gen))
-      return log.fail('Unknown language "' + argv.lang + '"');
-
-    var filename;
-    if (argv.gen) {
-      // try to use a new filename to avoid overwrite by mistake
-      filename = problem.id + '.' + problem.slug + h.langToExt(argv.lang);
-      var i = 0;
-      while (fs.existsSync(filename))
-        filename = problem.id + '.' + problem.slug + '.' + (i++) + h.langToExt(argv.lang);
+    var code;
+    var needcode = argv.gen || argv.codeonly;
+    if (needcode) {
+      var template = _.find(problem.templates, function(x) {
+        return x.value === argv.lang;
+      });
+      if (!template)
+        return log.fail('Unknown language "' + argv.lang + '"');
 
       var opts = {
         lang: argv.lang,
         code: template.defaultCode,
         tpl:  argv.extra ? 'detailed' : 'codeonly'
       };
-      fs.writeFileSync(filename, core.exportProblem(problem, opts));
+      code = core.exportProblem(problem, opts);
+    }
+
+    var filename;
+    if (argv.gen) {
+      filename = genFileName(problem, argv.lang);
+      fs.writeFileSync(filename, code);
 
       if (argv.editor !== undefined) {
         childProcess.spawn(argv.editor || config.EDITOR, [filename], {
           // in case your editor of choice is vim or emacs
           stdio: 'inherit'
         });
       }
+    } else {
+      if (argv.codeonly) {
+        log.info(chalk.yellow(code));
+        return;
+      }
     }
 
-    if (argv.desc) {
-      log.printf('[%d] %s %s', problem.id, problem.name,
-          (problem.starred ? chalk.yellow(icon.like) : icon.none));
-      log.info();
-      log.info(chalk.underline(problem.link));
-
-      log.info();
-      log.printf('* %s', problem.category);
-      log.printf('* %s (%.2f%%)', h.prettyLevel(problem.level), problem.percent);
+    log.printf('[%d] %s %s', problem.id, problem.name,
+        (problem.starred ? chalk.yellow(icon.like) : icon.none));
+    log.info();
+    log.info(chalk.underline(problem.link));
 
-      if (filename)
-        log.printf('* Source Code:       %s', chalk.yellow.underline(filename));
-      if (problem.totalAC)
-        log.printf('* Total Accepted:    %s', problem.totalAC);
-      if (problem.totalSubmit)
-        log.printf('* Total Submissions: %s', problem.totalSubmit);
-      if (problem.testable && problem.testcase)
-        log.printf('* Testcase Example:  %s', chalk.yellow(util.inspect(problem.testcase)));
+    log.info();
+    log.printf('* %s', problem.category);
+    log.printf('* %s (%.2f%%)', h.prettyLevel(problem.level), problem.percent);
 
-      log.info();
-      log.info(problem.desc);
+    if (filename)
+      log.printf('* Source Code:       %s', chalk.yellow.underline(filename));
+    if (problem.totalAC)
+      log.printf('* Total Accepted:    %s', problem.totalAC);
+    if (problem.totalSubmit)
+      log.printf('* Total Submissions: %s', problem.totalSubmit);
+    if (problem.testable && problem.testcase)
+      log.printf('* Testcase Example:  %s', chalk.yellow(util.inspect(problem.testcase)));
 
-      if (argv.template) {
-        log.info();
-        log.info('Template:');
-        log.info();
-      }
-    }
-
-    if (argv.template) {
-      log.info(chalk.yellow(template.defaultCode));
-    }
+    log.info();
+    log.info(problem.desc);
   });
 };