Refactor helper.

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

Author: skygragon

.eslintrc.js

@@ -10,7 +10,7 @@ module.exports = {
       "max-len": [1, 120],
       "no-eval": 1, // we use it on purpose
       "no-loop-func": 1,
-      "no-multi-spaces": [2, { exceptions: { "SwitchCase": true }}],
+      "no-multi-spaces": 0,
       "no-proto": 1,
       "no-unused-expressions": 1,
       "no-unused-vars": 1,

lib/helper.js

@@ -3,6 +3,47 @@ var path = require('path');
 
 var _ = require('underscore');
 
+var UNITS_SIZE = [
+  {unit: 'B', name: 'Bytes',  count: 1024},
+  {unit: 'K', name: 'KBytes', count: 1024},
+  {unit: 'M', name: 'MBytes', count: 1024},
+  {unit: 'G', name: 'GBytes', count: -1}
+];
+
+var UNITS_TIME = [
+  {unit: 's', name: 'seconds', count: 60},
+  {unit: 'm', name: 'minutes', count: 60},
+  {unit: 'h', name: 'hours',   count: 24},
+  {unit: 'd', name: 'days',    count: 7},
+  {unit: 'w', name: 'weeks',   count: 4},
+  {unit: 'm', name: 'months',  count: 12},
+  {unit: 'y', name: 'years',   count: -1}
+];
+
+function getUnit(units, v) {
+  for (var i = 0; i < units.length; ++i) {
+    if (units[i].count <= 0 || v < units[i].count)
+      return [v, units[i]];
+    v /= units[i].count;
+  }
+}
+
+var LANGS = [
+  {lang: 'bash',       ext: '.sh',    style: '#'},
+  {lang: 'c',          ext: '.c',     style: 'c'},
+  {lang: 'cpp',        ext: '.cpp',   style: 'c'},
+  {lang: 'csharp',     ext: '.cs',    style: 'c'},
+  {lang: 'golang',     ext: '.go',    style: 'c'},
+  {lang: 'java',       ext: '.java',  style: 'c'},
+  {lang: 'javascript', ext: '.js',    style: 'c'},
+  {lang: 'mysql',      ext: '.sql',   style: '#'},
+  {lang: 'python',     ext: '.py',    style: '#'},
+  {lang: 'python3',    ext: '.py3',   style: '#'},
+  {lang: 'ruby',       ext: '.rb',    style: '#'},
+  {lang: 'scala',      ext: '.scala', style: 'c'},
+  {lang: 'swift',      ext: '.swift', style: 'c'}
+];
+
 var h = {};
 
 h.prettyState = function(state) {
@@ -23,33 +64,14 @@ h.prettyText = function(text, yesNo) {
   }
 };
 
-h.prettySize = function(size) {
-  var units = 'BKMG';
-  var i = 0;
-  while (size >= 1024 && i < units.length) {
-    size /= 1024.0;
-    ++i;
-  }
-  return size.toFixed(2) + units[i];
-};
-
-h.prettyTime = function(d) {
-  var units = [
-    [60, 'secs'],
-    [60, 'mins'],
-    [24, 'hours'],
-    [7, 'days'],
-    [4, 'weeks'],
-    [12, 'months'],
-    [9999, 'years']
-  ];
-
-  var i = 0;
-  while (d >= units[i][0] && i < units.length) {
-    d /= units[i][0];
-    ++i;
-  }
-  return d.toFixed(0) + ' ' + units[i][1];
+h.prettySize = function(n) {
+  var res = getUnit(UNITS_SIZE, n);
+  return res[0].toFixed(2) + res[1].unit;
+};
+
+h.prettyTime = function(n) {
+  var res = getUnit(UNITS_TIME, n);
+  return res[0].toFixed(0) + ' ' + res[1].name;
 };
 
 h.levelToName = function(level) {
@@ -77,71 +99,28 @@ h.statusToName = function(sc) {
 };
 
 h.langToExt = function(lang) {
-  switch (lang) {
-    case 'bash':       return '.sh';
-    case 'c':          return '.c';
-    case 'cpp':        return '.cpp';
-    case 'csharp':     return '.cs';
-    case 'golang':     return '.go';
-    case 'java':       return '.java';
-    case 'javascript': return '.js';
-    case 'mysql':      return '.sql';
-    case 'python':     return '.py';
-    case 'python3':    return '.py3';
-    case 'ruby':       return '.rb';
-    case 'scala':      return '.scala';
-    case 'swift':      return '.swift';
-    default:           return '.raw';
-  }
+  var res = _.find(LANGS, function(x) {
+    return x.lang === lang;
+  });
+  return res ? res.ext : '.raw';
 };
 
 h.extToLang = function(fullpath) {
   var ext = path.extname(fullpath);
-  switch (ext) {
-    case '.c':     return 'c';
-    case '.cpp':   return 'cpp';
-    case '.cs':    return 'csharp';
-    case '.go':    return 'golang';
-    case '.java':  return 'java';
-    case '.js':    return 'javascript';
-    case '.py':    return 'python';
-    case '.py3':   return 'python3';
-    case '.rb':    return 'ruby';
-    case '.scala': return 'scala';
-    case '.sh':    return 'bash';
-    case '.sql':   return 'mysql';
-    case '.swift': return 'swift';
-    default:       return 'unknown';
-  }
+  var res = _.find(LANGS, function(x) {
+    return x.ext === ext;
+  });
+  return res ? res.lang : 'unknown';
 };
 
 h.langToCommentStyle = function(lang) {
-  switch (lang) {
-    case 'c':
-    case 'cpp':
-    case 'csharp':
-    case 'golang':
-    case 'java':
-    case 'javascript':
-    case 'scala':
-    case 'swift':
-    default:
-      return {
-        commentHeader: '/*',
-        commentLine:   ' *',
-        commentFooter: ' */'
-      };
-    case 'bash':
-    case 'mysql':
-    case 'python':
-    case 'python3':
-    case 'ruby':
-      return {
-        commentHeader: '#',
-        commentLine:   '#',
-        commentFooter: '#'
-      };
-  }
+  var res = _.find(LANGS, function(x) {
+    return x.lang === lang;
+  });
+
+  return (res && res.style === '#') ?
+  {commentHeader: '#',  commentLine: '#',  commentFooter: '#'} :
+  {commentHeader: '/*', commentLine: ' *', commentFooter: ' */'};
 };
 
 h.getFileData = function(p) {

test/test_helper.js

@@ -58,9 +58,9 @@ describe('helper', function() {
 
   describe('#prettyTime', function() {
     it('should ok', function() {
-      assert.equal(h.prettyTime(30), '30 secs');
-      assert.equal(h.prettyTime(60), '1 mins');
-      assert.equal(h.prettyTime(2400), '40 mins');
+      assert.equal(h.prettyTime(30), '30 seconds');
+      assert.equal(h.prettyTime(60), '1 minutes');
+      assert.equal(h.prettyTime(2400), '40 minutes');
       assert.equal(h.prettyTime(3600), '1 hours');
       assert.equal(h.prettyTime(7200), '2 hours');
       assert.equal(h.prettyTime(86400), '1 days');