Skip to content

Commit b0c99db

Browse files
skygragonskygragon
committed
[log unify] replace console.log to loglevel
Signed-off-by: Eric Wang <[email protected]>
1 parent 8a62653 commit b0c99db

File tree

4 files changed

+38
-31
lines changed

4 files changed

+38
-31
lines changed

‎lib/cli.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ function setLogLevel() {
2323
if (process.argv.indexOf('-vv') >= 0) level = log.levels.TRACE;
2424

2525
log.setLevel(level);
26+
27+
log.fail = function(msg) {
28+
log.error(chalk.red('ERROR: ' + msg));
29+
};
2630
}
2731

2832
function checkCache() {

‎lib/commands/list.js

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
var _ = require('underscore');
22
var sprintf = require('sprintf-js').sprintf;
3+
var log = require('loglevel');
34

45
var core = require('../core');
56
var h = require('../helper');
@@ -54,7 +55,7 @@ var QUERY_HANDLERS = {
5455

5556
cmd.handler = function(argv) {
5657
core.getProblems(function(e, problems) {
57-
if (e) return console.log('ERROR:', e);
58+
if (e) return log.fail(e);
5859

5960
var all = problems.length;
6061

@@ -79,7 +80,7 @@ cmd.handler = function(argv) {
7980
stat[problem.state] = (stat[problem.state] || 0) + 1;
8081
if (problem.locked) ++stat.locked;
8182

82-
console.log(sprintf('%s %s [%3d] %-60s %-6s (%.2f %%)',
83+
log.info(sprintf('%s %s [%3d] %-60s %-6s (%.2f %%)',
8384
h.prettyState(problem.state),
8485
(problem.locked ? '🔒' : ' '),
8586
problem.id,
@@ -89,12 +90,12 @@ cmd.handler = function(argv) {
8990
});
9091

9192
if (argv.stat) {
92-
console.log();
93-
console.log(sprintf(' All: %-9d Listed: %-9d Lock: %-9d',
93+
log.info();
94+
log.info(sprintf(' All: %-9d Listed: %-9d Lock: %-9d',
9495
all, problems.length, stat.locked));
95-
console.log(sprintf(' AC: %-9d Not-AC: %-9d New: %-9d',
96+
log.info(sprintf(' AC: %-9d Not-AC: %-9d New: %-9d',
9697
(stat.ac || 0), (stat.notac || 0), (stat.None || 0)));
97-
console.log(sprintf(' Easy: %-9d Medium: %-9d Hard: %-9d',
98+
log.info(sprintf(' Easy: %-9d Medium: %-9d Hard: %-9d',
9899
(stat.Easy || 0), (stat.Medium || 0), (stat.Hard || 0)));
99100
}
100101
});

‎lib/commands/show.js

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
var _ = require('underscore');
2-
var chalk = require('chalk');
31
var fs = require('fs');
42
var util = require('util');
53

4+
var _ = require('underscore');
5+
var chalk = require('chalk');
6+
var log = require('loglevel');
67
var sprintf = require('sprintf-js').sprintf;
78

89
var config = require('../config');
@@ -29,33 +30,33 @@ var cmd = {
2930

3031
cmd.handler = function(argv) {
3132
core.getProblem(argv.keyword, function(e, problem) {
32-
if (e) return console.log('ERROR:', e);
33+
if (e) return log.fail(e);
3334

3435
var msg = '';
3536
if (argv.gen) {
3637
var template = _.find(problem.templates, function(x) {
3738
return x.value === argv.lang;
3839
});
3940
if (!template)
40-
return console.log('Failed to generate source file: ' +
41-
'unknown language ' + argv.lang);
41+
return log.fail('Failed to generate source file, ' +
42+
'unknown language "' + argv.lang + '"');
4243

4344
var f = problem.key + h.langToExt(argv.lang);
4445
fs.writeFileSync(f, template.defaultCode);
4546
msg = sprintf('(File: %s)', chalk.yellow.underline(f));
4647
}
4748

48-
console.log(sprintf('[%d] %s\t%s\n', problem.id, problem.name, msg));
49-
console.log(sprintf('%s\n', chalk.underline(problem.link)));
50-
console.log(sprintf('* %s (%.2f%%)', problem.level, problem.percent));
51-
console.log(sprintf('* Total Accepted: %d', problem.totalAC));
52-
console.log(sprintf('* Total Submissions: %d', problem.totalSubmit));
49+
log.info(sprintf('[%d] %s\t%s\n', problem.id, problem.name, msg));
50+
log.info(sprintf('%s\n', chalk.underline(problem.link)));
51+
log.info(sprintf('* %s (%.2f%%)', problem.level, problem.percent));
52+
log.info(sprintf('* Total Accepted: %d', problem.totalAC));
53+
log.info(sprintf('* Total Submissions: %d', problem.totalSubmit));
5354
if (problem.testable && problem.testcase) {
54-
console.log(sprintf('* Testcase Example: %s',
55+
log.info(sprintf('* Testcase Example: %s',
5556
chalk.yellow(util.inspect(problem.testcase))));
5657
}
57-
console.log();
58-
console.log(problem.desc);
58+
log.info();
59+
log.info(problem.desc);
5960
});
6061
};
6162

‎lib/commands/user.js

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
var chalk = require('chalk');
2+
var log = require('loglevel');
23
var prompt = require('prompt');
34
var sprintf = require('sprintf-js').sprintf;
45

@@ -51,32 +52,32 @@ cmd.handler = function(argv) {
5152
{name: 'login', required: true},
5253
{name: 'pass', required: true, hidden: true}
5354
], function(e, user) {
54-
if (e) return console.log('Login failed:', e);
55+
if (e) return log.fail(e);
5556

5657
core.login(user, function(e, user) {
57-
if (e) return console.log('Login failed:', e);
58+
if (e) return log.fail(e);
5859

59-
console.log('Successfully login as', chalk.yellow(user.name));
60+
log.info('Successfully login as', chalk.yellow(user.name));
6061
});
6162
});
6263
} else if (argv.logout) {
6364
// logout
6465
user = core.logout(null);
6566
if (user)
66-
console.log('Successfully logout as', chalk.yellow(user.name));
67+
log.info('Successfully logout as', chalk.yellow(user.name));
6768
else
68-
console.log('You are not login yet?');
69+
log.fail('You are not login yet?');
6970
} else {
7071
// show current user
7172
user = core.getUser();
7273
if (user)
73-
console.log('You are now login as', chalk.yellow(user.name));
74+
log.info('You are now login as', chalk.yellow(user.name));
7475
else
75-
return console.log('You are not login yet?');
76+
return log.fail('You are not login yet?');
7677

7778
if (argv.stat) {
7879
core.getProblems(function(e, problems) {
79-
if (e) return console.log('Get stats failed:', e);
80+
if (e) return log.fail(e);
8081

8182
var stats = {};
8283
problems.forEach(function(problem) {
@@ -86,10 +87,10 @@ cmd.handler = function(argv) {
8687
stats[keyAC] = (stats[keyAC] || 0) + 1;
8788
});
8889

89-
console.log();
90-
console.log(prettyLine('Easy', stats.acEasy, stats.allEasy));
91-
console.log(prettyLine('Medium', stats.acMedium, stats.allMedium));
92-
console.log(prettyLine('Hard', stats.acHard, stats.allHard));
90+
log.info();
91+
log.info(prettyLine('Easy', stats.acEasy, stats.allEasy));
92+
log.info(prettyLine('Medium', stats.acMedium, stats.allMedium));
93+
log.info(prettyLine('Hard', stats.acHard, stats.allHard));
9394
});
9495
}
9596
}

0 commit comments

Comments
 (0)