remove sprintf-js

skygragon · skygragon · commit aaf64517d61c · 2018-11-25T21:35:25.000+08:00
Signed-off-by: Eric Wang &lt;skygragon@gmail.com&gt;
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -17,6 +17,7 @@ module.exports = {
       "curly": 0,
       "key-spacing": [2, {align: "value"}],
       "max-len": [1, 120],
+      "no-control-regex": 0,
       "no-console": 1,
       "no-empty": [2, { "allowEmptyCatch": true }],
       "no-eval": 1, // we use it on purpose
diff --git a/lib/commands/cache.js b/lib/commands/cache.js
@@ -1,12 +1,12 @@
 'use strict';
 var _ = require('underscore');
-var sprintf = require('sprintf-js').sprintf;
 
 var h = require('../helper');
 var chalk = require('../chalk');
 var log = require('../log');
 var cache = require('../cache');
 var session = require('../session');
+var sprintf = require('../sprintf');
 
 const cmd = {
   command: 'cache [keyword]',
@@ -56,8 +56,8 @@ cmd.handler = function(argv) {
       return x;
     })
     .forEach(function(f) {
-      log.printf(' %s %8s    %s ago',
-          chalk.green(sprintf('%-60s', f.name)),
+      log.printf(' %-60s %8s    %s ago',
+          chalk.green(f.name),
           h.prettySize(f.size),
           h.prettyTime((Date.now() - f.mtime) / 1000));
     });
diff --git a/lib/commands/list.js b/lib/commands/list.js
@@ -1,6 +1,5 @@
 'use strict';
 var _ = require('underscore');
-var sprintf = require('sprintf-js').sprintf;
 
 var h = require('../helper');
 var chalk = require('../chalk');
@@ -67,14 +66,14 @@ cmd.handler = function(argv) {
       if (problem.locked) ++stat.locked;
       if (problem.starred) ++stat.starred;
 
-      log.printf('%s %s %s [%4d] %-60s %-6s (%.2f %%)',
+      log.printf('%s %s %s [%=4s] %-60s %-6s (%s %%)',
           (problem.starred ? chalk.yellow(icon.like) : icon.empty),
           (problem.locked ? chalk.red(icon.lock) : icon.nolock),
           h.prettyState(problem.state),
           problem.fid,
           problem.name,
-          h.prettyLevel(sprintf('%-6s', problem.level)),
-          problem.percent);
+          h.prettyLevel(problem.level),
+          problem.percent.toFixed(2));
 
       if (argv.extra) {
         let badges = [problem.category];
@@ -99,9 +98,9 @@ cmd.handler = function(argv) {
 
     if (argv.stat) {
       log.info();
-      log.printf('      Listed: %-9d Locked:  %-9d Starred: %-9d', problems.length, stat.locked, stat.starred);
-      log.printf('      Accept: %-9d Not-AC:  %-9d Remain:  %-9d', stat.ac, stat.notac, stat.None);
-      log.printf('      Easy:   %-9d Medium:  %-9d Hard:    %-9d', stat.Easy, stat.Medium, stat.Hard);
+      log.printf('      Listed: %-9s Locked:  %-9s Starred: %-9s', problems.length, stat.locked, stat.starred);
+      log.printf('      Accept: %-9s Not-AC:  %-9s Remain:  %-9s', stat.ac, stat.notac, stat.None);
+      log.printf('      Easy:   %-9s Medium:  %-9s Hard:    %-9s', stat.Easy, stat.Medium, stat.Hard);
     }
   });
 };
diff --git a/lib/commands/plugin.js b/lib/commands/plugin.js
@@ -1,12 +1,11 @@
 'use strict';
-var sprintf = require('sprintf-js').sprintf;
-
 var h = require('../helper');
 var chalk = require('../chalk');
 var config = require('../config');
 var log = require('../log');
 var Plugin = require('../plugin');
 var session = require('../session');
+var sprintf = require('../sprintf');
 
 const cmd = {
   command: 'plugin [name]',
diff --git a/lib/commands/session.js b/lib/commands/session.js
@@ -1,12 +1,12 @@
 'use strict';
 var prompt = require('prompt');
-var sprintf = require('sprintf-js').sprintf;
 
 var h = require('../helper');
 var chalk = require('../chalk');
 var log = require('../log');
 var core = require('../core');
 var session = require('../session');
+var sprintf = require('../sprintf');
 
 const cmd = {
   command: 'session [keyword]',
@@ -61,14 +61,14 @@ function printSessions(e, sessions) {
     if (s.total_submitted > 0)
       submissionRate = s.total_acs * 100 / s.total_submitted;
 
-    log.printf('   %s   %8d   %-26s %s (%6s %%) %s (%6s %%)',
+    log.printf('   %s   %8s   %-26s %6s (%6s %%) %6s (%6s %%)',
       s.is_active ? h.prettyState('ac') : ' ',
       s.id,
       s.name || 'Anonymous Session',
-      chalk.green(sprintf('%6s', s.ac_questions)),
-      sprintf('%.2f', questionRate),
-      chalk.green(sprintf('%6s', s.total_acs)),
-      sprintf('%.2f', submissionRate));
+      chalk.green(s.ac_questions),
+      questionRate.toFixed(2),
+      chalk.green(s.total_acs),
+      submissionRate.toFixed(2));
   }
 }
 
diff --git a/lib/commands/show.js b/lib/commands/show.js
@@ -137,7 +137,7 @@ function showProblem(problem, argv) {
     }
   }
 
-  log.printf('[%d] %s %s', problem.fid, problem.name,
+  log.printf('[%s] %s %s', problem.fid, problem.name,
       (problem.starred ? chalk.yellow(icon.like) : icon.empty));
   log.info();
   log.info(chalk.underline(problem.link));
@@ -150,7 +150,7 @@ function showProblem(problem, argv) {
 
   log.info();
   log.printf('* %s', problem.category);
-  log.printf('* %s (%.2f%%)', h.prettyLevel(problem.level), problem.percent);
+  log.printf('* %s (%s%%)', h.prettyLevel(problem.level), problem.percent.toFixed(2));
 
   if (filename)
     log.printf('* Source Code:       %s', chalk.yellow.underline(filename));
diff --git a/lib/commands/star.js b/lib/commands/star.js
@@ -35,7 +35,7 @@ cmd.handler = function(argv) {
     core.starProblem(problem, !argv.delete, function(e, starred) {
       if (e) return log.fail(e);
 
-      log.printf('[%d] %s %s', problem.fid, problem.name,
+      log.printf('[%s] %s %s', problem.fid, problem.name,
           chalk.yellow(starred ? icon.like : icon.unlike));
 
       core.updateProblem(problem, {starred: starred});
diff --git a/lib/commands/stat.js b/lib/commands/stat.js
@@ -1,13 +1,13 @@
 'use strict';
 var moment = require('moment');
-var sprintf = require('sprintf-js').sprintf;
 var _ = require('underscore');
 
 var chalk = require('../chalk');
 var icon = require('../icon');
 var log = require('../log');
 var core = require('../core');
 var session = require('../session');
+var sprintf = require('../sprintf');
 var h = require('../helper');
 
 const cmd = {
@@ -50,9 +50,9 @@ function printLine(key, done, all) {
   const n = 30;
   const percent = (all > 0) ? done / all : 0;
   const x = Math.ceil(n * percent);
-  log.printf(' %s\t%3d/%-3d (%6s %%)  %s%s',
+  log.printf(' %s\t%3s/%-3s (%6s %%)  %s%s',
     h.prettyLevel(key), done, all,
-    sprintf('%.2f', 100 * percent),
+    (100 * percent).toFixed(2),
     chalk.green('█'.repeat(x)),
     chalk.red('░'.repeat(n - x)));
 }
@@ -96,15 +96,15 @@ function showGraph(problems) {
   if (groups > 5) groups = 5;
 
   const header = _.range(groups)
-    .map(x => sprintf('%4d%18d', x * 10 + 1, x * 10 + 10))
+    .map(x => sprintf('%4s%18s', x * 10 + 1, x * 10 + 10))
     .join('');
   log.info('     ' + header);
 
   const graph = [];
   for (let problem of problems)
     graph[problem.fid] = ICONS[problem.state] || ICONS.none;
 
-  let line = [sprintf(' %03d', 0)];
+  let line = [sprintf('%04s', 0)];
   for (let i = 1, n = graph.length; i <= n; ++i) {
     // padding before group
     if (i % 10 === 1) line.push(' ');
@@ -114,7 +114,7 @@ function showGraph(problems) {
     // time to start new row
     if (i % (10 * groups) === 0 || i === n) {
       log.info(line.join(' '));
-      line = [sprintf(' %03d', i)];
+      line = [sprintf('%04s', i)];
     }
   }
 
diff --git a/lib/commands/submission.js b/lib/commands/submission.js
@@ -62,7 +62,7 @@ function doTask(problem, queue, cb) {
     // - green: accepted, fresh download
     // - yellow: not ac-ed, fresh download
     // - white: existed already, skip download
-    log.printf('[%4d] %-60s %s', problem.fid, problem.name,
+    log.printf('[%=4s] %-60s %s', problem.fid, problem.name,
         (e ? chalk.red('ERROR: ' + (e.msg || e)) : msg));
     if (cb) cb(e);
   }
diff --git a/lib/commands/user.js b/lib/commands/user.js
@@ -1,13 +1,13 @@
 'use strict';
 var prompt = require('prompt');
-var sprintf = require('sprintf-js').sprintf;
 
 var h = require('../helper');
 var config = require('../config');
 var chalk = require('../chalk');
 var log = require('../log');
 var core = require('../core');
 var session = require('../session');
+var sprintf = require('../sprintf');
 
 const cmd = {
   command: 'user',
@@ -65,9 +65,9 @@ cmd.handler = function(argv) {
     if (user) {
       log.info(chalk.gray(sprintf(' %-9s %-20s %s', 'Premium', 'User', 'Host')));
       log.info(chalk.gray('-'.repeat(60)));
-      log.printf('    %s      %s %s',
+      log.printf('    %s      %-20s %s',
         h.prettyText('', user.paid || false),
-        chalk.yellow(sprintf('%-20s', user.name)),
+        chalk.yellow(user.name),
         config.sys.urls.base);
     } else
       return log.fail('You are not login yet?');
diff --git a/lib/log.js b/lib/log.js
@@ -1,8 +1,8 @@
 'use strict';
 var _ = require('underscore');
-var sprintf = require('sprintf-js').sprintf;
 
 var chalk = require('./chalk');
+var sprintf = require('./sprintf');
 
 const log = {
   output: _.bind(console.log, console),
@@ -27,7 +27,7 @@ log.isEnabled = function(name) {
 log.fail = function(e) {
   let msg = sprintf('%s', (e.msg || e));
   if (e.statusCode) {
-    msg += sprintf(' [code=%d]', e.statusCode);
+    msg += sprintf(' [code=%s]', e.statusCode);
   }
   log.error(msg);
 };
diff --git a/lib/sprintf.js b/lib/sprintf.js
@@ -0,0 +1,56 @@
+'use strict'
+
+function len(s) {
+  let s1 = s.replace(/\u001b\[[^m]*m/g, ''); // remove color controls
+  s1 = s1.replace(/[^\x00-\xff]/g, '  '); // fix non-ascii
+  return s1.length;
+}
+
+function padLeft(s, n, c) {
+  let k = Math.max(0, n - len(s));
+  return c.repeat(k) + s;
+}
+
+function padRight(s, n , c) {
+  let k = Math.max(0, n - len(s));
+  return s + c.repeat(k);
+}
+
+function padCenter(s, n, c) {
+  let k = Math.max(0, n - len(s));
+  let r = (k - k % 2) / 2, l = k - r;
+  return c.repeat(l) + s + c.repeat(r);
+}
+
+const tsprintf = function() {
+  const args = Array.from(arguments);
+  let fmt = args.shift();
+  return fmt.replace(/%[^s%]*[s%]/g, function(s) {
+    if (s === '%%') return '%';
+
+    let x = '' + args.shift();
+    let n = 0;
+
+    s = s.slice(1, s.length-1);
+    if (s.length > 0) {
+      switch (s[0]) {
+        case '-':
+          n = parseInt(s.slice(1)) || 0;
+          x = padRight(x, n, ' ');
+          break;
+        case '=':
+          n = parseInt(s.slice(1)) || 0;
+          x = padCenter(x, n, ' ');
+          break;
+        default:
+          n = parseInt(s) || 0;
+          x = padLeft(x, n, ' ');
+          break;
+      }
+    }
+
+    return x;
+  });
+};
+
+module.exports = tsprintf;
diff --git a/package.json b/package.json
@@ -59,7 +59,6 @@
     "ora": "3.0.0",
     "prompt": "1.0.0",
     "request": "2.88.0",
-    "sprintf-js": "1.1.1",
     "supports-color": "5.5.0",
     "underscore": "1.9.1",
     "wordwrap": "1.0.0",
diff --git a/test/test_log.js b/test/test_log.js
@@ -102,7 +102,7 @@ describe('log', function() {
 
   describe('#printf', function() {
     it('should ok', function() {
-      log.printf('%s and %d and %%', 'string', 100);
+      log.printf('%s and %s and %%', 'string', 100);
       assert.equal(expected, 'string and 100 and %');
     });
   }); // #printf
diff --git a/test/test_sprintf.js b/test/test_sprintf.js
@@ -0,0 +1,33 @@
+'use strict';
+const assert = require('chai').assert;
+const rewire = require('rewire');
+
+const sprintf = require('../lib/sprintf');
+
+describe('sprintf', function() {
+  it('should ok', function() {
+    assert.equal(sprintf('%%'), '%');
+    assert.equal(sprintf('%s', 123), '123');
+    assert.equal(sprintf('%6s', 123), '   123');
+    assert.equal(sprintf('%-6s', 123), '123   ');
+    assert.equal(sprintf('%=6s', 123), '  123 ');
+
+    assert.equal(sprintf('%4s,%=4s,%-4s', 123, 'xy', 3.1), ' 123, xy ,3.1 ');
+  });
+
+  it('should non-ascii ok', function() {
+    assert.equal(sprintf('%4s', '中'), '  中');
+    assert.equal(sprintf('%-4s', '中'), '中  ');
+    assert.equal(sprintf('%=4s', '中'), ' 中 ');
+
+    assert.equal(sprintf('%=14s', '12你好34世界'), ' 12你好34世界 ');
+  });
+
+  it('should color ok', function() {
+    const chalk = rewire('../lib/chalk');
+    chalk.init();
+    chalk.setTheme('default');
+
+    assert.equal(sprintf('%=3s', chalk.red('X')), ' \u001b[38;5;196mX\u001b[39m ');
+  });
+});

Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ function showProblem(problem, argv) {`
`137`	`137`	`}`
`138`	`138`	`}`
`139`	`139`
`140`		`- log.printf('[%d] %s %s', problem.fid, problem.name,`
	`140`	`+ log.printf('[%s] %s %s', problem.fid, problem.name,`
`141`	`141`	`(problem.starred ? chalk.yellow(icon.like) : icon.empty));`
`142`	`142`	`log.info();`
`143`	`143`	`log.info(chalk.underline(problem.link));`
`@@ -150,7 +150,7 @@ function showProblem(problem, argv) {`
`150`	`150`
`151`	`151`	`log.info();`
`152`	`152`	`log.printf('* %s', problem.category);`
`153`		`- log.printf('* %s (%.2f%%)', h.prettyLevel(problem.level), problem.percent);`
	`153`	`+ log.printf('* %s (%s%%)', h.prettyLevel(problem.level), problem.percent.toFixed(2));`
`154`	`154`
`155`	`155`	`if (filename)`
`156`	`156`	`log.printf('* Source Code: %s', chalk.yellow.underline(filename));`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ function doTask(problem, queue, cb) {`
`62`	`62`	`// - green: accepted, fresh download`
`63`	`63`	`// - yellow: not ac-ed, fresh download`
`64`	`64`	`// - white: existed already, skip download`
`65`		`- log.printf('[%4d] %-60s %s', problem.fid, problem.name,`
	`65`	`+ log.printf('[%=4s] %-60s %s', problem.fid, problem.name,`
`66`	`66`	`(e ? chalk.red('ERROR: ' + (e.msg \|\| e)) : msg));`
`67`	`67`	`if (cb) cb(e);`
`68`	`68`	`}`