[refactor] simplify template format.

skygragon · skygragon · commit 167fa23b5f68 · 2018-11-18T12:46:51.000+08:00
Signed-off-by: Eric Wang &lt;skygragon@gmail.com&gt;
diff --git a/lib/cli.js b/lib/cli.js
@@ -54,6 +54,7 @@ function initLogLevel() {
 }
 
 function initDir() {
+  file.init();
   file.mkdir(file.homeDir())
 }
 
diff --git a/lib/file.js b/lib/file.js
@@ -7,6 +7,13 @@ var mkdirp = require('mkdirp');
 
 const file = {}
 
+file.init = function() {
+  _.templateSettings = {
+    evaluate:    /\{\{(.+?)\}\}/g,
+    interpolate: /\$\{(.+?)\}/g
+  };
+};
+
 file.isWindows = function() {
   return process.platform === 'win32';
 };
diff --git a/templates/codeonly.tpl b/templates/codeonly.tpl
@@ -1 +1 @@
-<%= code %>
+${code}
diff --git a/templates/detailed.tpl b/templates/detailed.tpl
@@ -1,16 +1,16 @@
-<%= comment.start %>
-<%= comment.line %> @lc app=<%= app %> id=<%= fid %> lang=<%= lang %>
-<%= comment.line %>
-<%= comment.line %> [<%= fid %>] <%= name %>
-<%= comment.line %>
-<%= comment.line %> <%= link %>
-<%= comment.line %>
-<%= comment.line %> <%= category %>
-<%= comment.line %> <%= level %> (<%= percent %>%)
-<%= comment.line %> Total Accepted:    <%= totalAC %>
-<%= comment.line %> Total Submissions: <%= totalSubmit %>
-<%= comment.line %> Testcase Example:  <%= testcase %>
-<%= comment.line %>
-<% desc.forEach(function(x) { %><%= comment.line %> <%= x %>
-<% }) %><%= comment.end %>
-<%= code %>
+${comment.start}
+${comment.line} @lc app=${app} id=${fid} lang=${lang}
+${comment.line}
+${comment.line} [${fid}] ${name}
+${comment.line}
+${comment.line} ${link}
+${comment.line}
+${comment.line} ${category}
+${comment.line} ${level} (${percent}%)
+${comment.line} Total Accepted:    ${totalAC}
+${comment.line} Total Submissions: ${totalSubmit}
+${comment.line} Testcase Example:  ${testcase}
+${comment.line}
+{{ desc.forEach(function(x) { }}${comment.line} ${x}
+{{ }) }}${comment.end}
+${code}
diff --git a/test/test_core.js b/test/test_core.js
@@ -142,6 +142,14 @@ describe('core', function() {
   }); // #starProblem
 
   describe('#exportProblem', function() {
+    let file;
+
+    beforeEach(function() {
+      file = rewire('../lib/file');
+      file.init();
+      core.__set__('file', file);
+    });
+
     it('should codeonly ok', function() {
       const expected = [
         '/**',
@@ -171,9 +179,7 @@ describe('core', function() {
     });
 
     it('should codeonly ok in windows', function() {
-      const file = rewire('../lib/file');
       file.isWindows = () => true;
-      core.__set__('file', file);
 
       const expected = [
         '/**',

Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,7 @@ function initLogLevel() {`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`function initDir() {`
	`57`	`+ file.init();`
`57`	`58`	`file.mkdir(file.homeDir())`
`58`	`59`	`}`
`59`	`60`