refs #55: uses traditional ".py" in python3 filename.

Signed-off-by: Eric Wang <[email protected]>

Author: skygragon

Diff for: lib/helper.js

@@ -30,20 +30,20 @@ function getUnit(units, v) {
 }
 
 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: 'kotlin',     ext: '.kt',    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'}
+  {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: 'kotlin',     ext: '.kt',         style: 'c'},
+  {lang: 'mysql',      ext: '.sql',        style: '#'},
+  {lang: 'python',     ext: '.py',         style: '#'},
+  {lang: 'python3',    ext: '.python3.py', style: '#'},
+  {lang: 'ruby',       ext: '.rb',         style: '#'},
+  {lang: 'scala',      ext: '.scala',      style: 'c'},
+  {lang: 'swift',      ext: '.swift',      style: 'c'}
 ];
 
 var h = {};
@@ -130,11 +130,18 @@ h.langToExt = function(lang) {
 };
 
 h.extToLang = function(fullpath) {
-  var ext = path.extname(fullpath);
-  var res = _.find(LANGS, function(x) {
-    return x.ext === ext;
-  });
-  return res ? res.lang : 'unknown';
+  // HACK: compatible with old ext
+  if (fullpath.endsWith('.py3')) return 'python3';
+
+  var res = _.chain(LANGS)
+    .filter(function(x) {
+      return fullpath.endsWith(x.ext);
+    })
+    .sortBy(function(x) {
+      return -x.ext.length;
+    })
+    .value();
+  return res.length ? res[0].lang : 'unknown';
 };
 
 h.langToCommentStyle = function(lang) {

Diff for: test/test_helper.js

@@ -119,7 +119,7 @@ describe('helper', function() {
       assert.equal(h.langToExt('javascript'), '.js');
       assert.equal(h.langToExt('mysql'), '.sql');
       assert.equal(h.langToExt('python'), '.py');
-      assert.equal(h.langToExt('python3'), '.py3');
+      assert.equal(h.langToExt('python3'), '.python3.py');
       assert.equal(h.langToExt('ruby'), '.rb');
       assert.equal(h.langToExt('scala'), '.scala');
       assert.equal(h.langToExt('swift'), '.swift');
@@ -138,6 +138,7 @@ describe('helper', function() {
       assert.equal(h.extToLang('c:/file.js'), 'javascript');
       assert.equal(h.extToLang('c:/Users/skygragon/file.py'), 'python');
       assert.equal(h.extToLang('c:/Users/skygragon/file.py3'), 'python3');
+      assert.equal(h.extToLang('c:/Users/skygragon/file.python3.py'), 'python3');
       assert.equal(h.extToLang('~/file.rb'), 'ruby');
       assert.equal(h.extToLang('/tmp/file.scala'), 'scala');
       assert.equal(h.extToLang('~/leetcode/file.swift'), 'swift');