Commit b807163

committed

Tuning output for cache and user.

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

1 parent dd4966e commit b807163Copy full SHA for b807163

File tree

+15

-5

lines changed

+15

-5

lines changed

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`'use strict';`
`2`	`2`	`var _ = require('underscore');`
	`3`	`+var sprintf = require('sprintf-js').sprintf;`
`3`	`4`
`4`	`5`	`var h = require('../helper');`
`5`	`6`	`var chalk = require('../chalk');`
`@@ -46,14 +47,17 @@ cmd.handler = function(argv) {`
`46`	`47`	`if (argv.delete) {`
`47`	`48`	`for (let f of caches) cache.del(f.name);`
`48`	`49`	`} else {`
	`50`	`+ log.info(chalk.gray(sprintf(' %s %63s %s', 'Cache', 'Size', 'Created')));`
	`51`	`+ log.info(chalk.gray('-'.repeat(86)));`
	`52`	`+`
`49`	`53`	`_.sortBy(caches, function(f) {`
`50`	`54`	`let x = parseInt(f.name.split('.')[0], 10);`
`51`	`55`	`if (Number.isNaN(x)) x = 0;`
`52`	`56`	`return x;`
`53`	`57`	`})`
`54`	`58`	`.forEach(function(f) {`
`55`		`- log.printf('%-80s %8s %s ago',`
`56`		`- chalk.green(f.name),`
	`59`	`+ log.printf(' %s %8s %s ago',`
	`60`	`+ chalk.green(sprintf('%-60s',f.name)),`
`57`	`61`	`h.prettySize(f.size),`
`58`	`62`	`h.prettyTime((Date.now() - f.mtime) / 1000));`
`59`	`63`	`});`

Lines changed: 9 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,8 @@`
`1`	`1`	`'use strict';`
`2`	`2`	`var prompt = require('prompt');`
	`3`	`+var sprintf = require('sprintf-js').sprintf;`
`3`	`4`
	`5`	`+var config = require('../config');`
`4`	`6`	`var chalk = require('../chalk');`
`5`	`7`	`var log = require('../log');`
`6`	`8`	`var core = require('../core');`
`@@ -59,9 +61,13 @@ cmd.handler = function(argv) {`
`59`	`61`	`} else {`
`60`	`62`	`// show current user`
`61`	`63`	`user = session.getUser();`
`62`		`- if (user)`
`63`		`- log.info('You are now login as', chalk.yellow(user.name));`
`64`		`- else`
	`64`	`+ if (user) {`
	`65`	`+ log.info(chalk.gray(sprintf(' %-20s %s', 'User', 'Host')));`
	`66`	`+ log.info(chalk.gray('-'.repeat(60)));`
	`67`	`+ log.printf(' %s %s',`
	`68`	`+ chalk.yellow(sprintf('%-20s', user.name)),`
	`69`	`+ config.sys.urls.base);`
	`70`	`+ } else`
`65`	`71`	`return log.fail('You are not login yet?');`
`66`	`72`	`}`
`67`	`73`	`};`

Comments

(0)