refs skygragon#121: support customized filename.

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

Author: skygragon

lib/commands/show.js

@@ -76,20 +76,18 @@ const cmd = {
 function genFileName(problem, opts) {
   const path = require('path');
   const params = [
-    problem.fid,
-    problem.slug,
+    file.fmt(config.file.show, problem),
     '',
     h.langToExt(opts.lang)
   ];
 
-  // try to use a new filename to avoid overwrite by mistake
-  let i = 0;
-  let name;
-  do {
-    name = path.join(opts.outdir, params.join('.').replace(/\.+/g, '.'));
-    params[2] = i++;
-  } while (fs.existsSync(name));
-  return name;
+  // try new name to avoid overwrite by mistake
+  for (let i = 0; ; ++i) {
+    const name = path.join(opts.outdir, params.join('.').replace(/\.+/g, '.'));
+    if (!fs.existsSync(name))
+      return name;
+    params[2] = i;
+  }
 }
 
 function showProblem(problem, argv) {
@@ -123,8 +121,8 @@ function showProblem(problem, argv) {
 
   let filename;
   if (argv.gen) {
-    filename = genFileName(problem, argv);
     file.mkdir(argv.outdir);
+    filename = genFileName(problem, argv);
     fs.writeFileSync(filename, code);
 
     if (argv.editor !== undefined) {

lib/commands/submission.js

@@ -1,11 +1,13 @@
 'use strict';
 var fs = require('fs');
+var path = require('path');
 
-var sprintf = require('sprintf-js').sprintf;
+var _ = require('underscore');
 
 var h = require('../helper');
 var file = require('../file');
 var chalk = require('../chalk');
+var config = require('../config');
 var log = require('../log');
 var Queue = require('../queue');
 var core = require('../core');
@@ -92,13 +94,11 @@ function exportSubmission(problem, argv, cb) {
     const submission = submissions.find(x => x.status_display === 'Accepted') || submissions[0];
     submission.ac = (submission.status_display === 'Accepted');
 
-    const f = sprintf('%s/%d.%s.%s.%s%s',
-        argv.outdir,
-        problem.fid,
-        problem.slug,
-        submission.id,
-        submission.ac ? 'ac' : 'notac',
-        h.langToExt(submission.lang));
+    const data = _.extend({}, submission, problem);
+    data.sid = submission.id;
+    data.ac = submission.ac ? 'ac' : 'notac';
+    const basename = file.fmt(config.file.submission, data);
+    const f = path.join(argv.outdir, basename + h.langToExt(submission.lang));
 
     file.mkdir(argv.outdir);
     // skip the existing cached submissions

lib/config.js

@@ -55,6 +55,10 @@ const DEFAULT_CONFIG = {
     editor: 'vim',
     lang:   'cpp'
   },
+  file: {
+    show:       '${fid}.${slug}',
+    submission: '${fid}.${slug}.${sid}.${ac}'
+  },
   color: {
     enable: true,
     theme:  'default'

lib/file.js

@@ -100,6 +100,10 @@ file.render = function(tpl, data) {
   return result;
 };
 
+file.fmt = function(format, data) {
+  return _.template(format)(data);
+};
+
 file.metaByName = function(filename) {
   const m = {};