Commit e7ac6a6

committed

refs skygragon#121: support customized filename.

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

1 parent 167fa23 commit e7ac6a6Copy full SHA for e7ac6a6

File tree

+25

-19

lines changed

+25

-19

lines changed

Lines changed: 9 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -76,20 +76,18 @@ const cmd = {`
`76`	`76`	`function genFileName(problem, opts) {`
`77`	`77`	`const path = require('path');`
`78`	`78`	`const params = [`
`79`		`- problem.fid,`
`80`		`- problem.slug,`
	`79`	`+ file.fmt(config.file.show, problem),`
`81`	`80`	`'',`
`82`	`81`	`h.langToExt(opts.lang)`
`83`	`82`	`];`
`84`	`83`
`85`		`- // try to use a new filename to avoid overwrite by mistake`
`86`		`- let i = 0;`
`87`		`- let name;`
`88`		`- do {`
`89`		`- name = path.join(opts.outdir, params.join('.').replace(/\.+/g, '.'));`
`90`		`- params[2] = i++;`
`91`		`- } while (fs.existsSync(name));`
`92`		`- return name;`
	`84`	`+ // try new name to avoid overwrite by mistake`
	`85`	`+ for (let i = 0; ; ++i) {`
	`86`	`+ const name = path.join(opts.outdir, params.join('.').replace(/\.+/g, '.'));`
	`87`	`+ if (!fs.existsSync(name))`
	`88`	`+ return name;`
	`89`	`+ params[2] = i;`
	`90`	`+ }`
`93`	`91`	`}`
`94`	`92`
`95`	`93`	`function showProblem(problem, argv) {`
`@@ -123,8 +121,8 @@ function showProblem(problem, argv) {`
`123`	`121`
`124`	`122`	`let filename;`
`125`	`123`	`if (argv.gen) {`
`126`		`- filename = genFileName(problem, argv);`
`127`	`124`	`file.mkdir(argv.outdir);`
	`125`	`+ filename = genFileName(problem, argv);`
`128`	`126`	`fs.writeFileSync(filename, code);`
`129`	`127`
`130`	`128`	`if (argv.editor !== undefined) {`

Lines changed: 8 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,13 @@`
`1`	`1`	`'use strict';`
`2`	`2`	`var fs = require('fs');`
	`3`	`+var path = require('path');`
`3`	`4`
`4`		`-var sprintf = require('sprintf-js').sprintf;`
	`5`	`+var _ = require('underscore');`
`5`	`6`
`6`	`7`	`var h = require('../helper');`
`7`	`8`	`var file = require('../file');`
`8`	`9`	`var chalk = require('../chalk');`
	`10`	`+var config = require('../config');`
`9`	`11`	`var log = require('../log');`
`10`	`12`	`var Queue = require('../queue');`
`11`	`13`	`var core = require('../core');`
`@@ -92,13 +94,11 @@ function exportSubmission(problem, argv, cb) {`
`92`	`94`	`const submission = submissions.find(x => x.status_display === 'Accepted') \|\| submissions[0];`
`93`	`95`	`submission.ac = (submission.status_display === 'Accepted');`
`94`	`96`
`95`		`- const f = sprintf('%s/%d.%s.%s.%s%s',`
`96`		`- argv.outdir,`
`97`		`- problem.fid,`
`98`		`- problem.slug,`
`99`		`- submission.id,`
`100`		`- submission.ac ? 'ac' : 'notac',`
`101`		`- h.langToExt(submission.lang));`
	`97`	`+ const data = _.extend({}, submission, problem);`
	`98`	`+ data.sid = submission.id;`
	`99`	`+ data.ac = submission.ac ? 'ac' : 'notac';`
	`100`	`+ const basename = file.fmt(config.file.submission, data);`
	`101`	`+ const f = path.join(argv.outdir, basename + h.langToExt(submission.lang));`
`102`	`102`
`103`	`103`	`file.mkdir(argv.outdir);`
`104`	`104`	`// skip the existing cached submissions`

Lines changed: 4 additions & 0 deletions

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -100,6 +100,10 @@ file.render = function(tpl, data) {`
`100`	`100`	`return result;`
`101`	`101`	`};`
`102`	`102`
	`103`	`+file.fmt = function(format, data) {`
	`104`	`+ return _.template(format)(data);`
	`105`	`+};`
	`106`	`+`
`103`	`107`	`file.metaByName = function(filename) {`
`104`	`108`	`const m = {};`
`105`	`109`

Comments

(0)