Commit 2a0c926

committed

Adapt stat graph to the real terminal width.

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

1 parent 029bec1 commit 2a0c926Copy full SHA for 2a0c926

File tree

+22

-7

lines changed

+22

-7

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -69,13 +69,14 @@ cli.run = function() {`
`69`	`69`	`});`
`70`	`70`
`71`	`71`	`var yargs = require('yargs');`
	`72`	`+ h.width = yargs.terminalWidth();`
`72`	`73`	`yargs.commandDir('commands')`
`73`	`74`	`.completion()`
`74`	`75`	`.help('h')`
`75`	`76`	`.alias('h', 'help')`
`76`	`77`	`.version(false)`
`77`	`78`	`.epilog('Seek more help at https://skygragon.github.io/leetcode-cli/commands')`
`78`		`- .wrap(Math.min(yargs.terminalWidth(), 120))`
	`79`	`+ .wrap(Math.min(h.width, 120))`
`79`	`80`	`.argv;`
`80`	`81`	`};`
`81`	`82`

Lines changed: 20 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -94,20 +94,34 @@ function showGraph(problems) {`
`94`	`94`	`none: chalk.gray('⬚ ')`
`95`	`95`	`};`
`96`	`96`
	`97`	`+ // row header is 4 bytes`
	`98`	`+ // each question takes 2 bytes`
	`99`	`+ // each group has 10 questions, which takes (2*10=20) + 3 paddings`
	`100`	`+ var groups = Math.floor((h.width - 4) / (3 + 2 * 10));`
	`101`	`+ if (groups < 1) groups = 1;`
	`102`	`+ if (groups > 5) groups = 5;`
	`103`	`+`
	`104`	`+ var header = _.range(groups)`
	`105`	`+ .map(function(x) { return sprintf('%5d%18d', x * 10 + 1, x * 10 + 10); })`
	`106`	`+ .join('');`
	`107`	`+ log.info(' ' + header);`
	`108`	`+`
`97`	`109`	`var graph = [];`
`98`	`110`	`_.each(problems, function(problem) {`
`99`	`111`	`graph[problem.id] = icons[problem.state] \|\| icons.none;`
`100`	`112`	`});`
`101`	`113`
`102`		`- log.printf('%8d%19d%5d%18d%5d%18d%5d%18d%5d%18d', 1, 10, 11, 20, 21, 30, 31, 40, 41, 50);`
`103`		`-`
`104`		`- var line = [sprintf(' %03d ', 0)];`
	`114`	`+ var line = [sprintf(' %03d', 0)];`
`105`	`115`	`for (var i = 1, n = graph.length; i <= n; ++i) {`
	`116`	`+ // padding before group`
	`117`	`+ if (i % 10 === 1) line.push(' ');`
	`118`	`+`
`106`	`119`	`line.push(graph[i] \|\| ' ');`
`107`		`- if (i % 10 === 0) line.push(' ');`
`108`		`- if (i % 50 === 0 \|\| i === n) {`
	`120`	`+`
	`121`	`+ // time to start new row`
	`122`	`+ if (i % (10 * groups) === 0 \|\| i === n) {`
`109`	`123`	`log.info(line.join(''));`
`110`		`- line = [sprintf(' %03d', i)];`
	`124`	`+ line = [sprintf(' %03d', i)];`
`111`	`125`	`}`
`112`	`126`	`}`
`113`	`127`

Comments

(0)