minor

iliakan · iliakan · commit 0310f0725889 · 2016-02-04T20:22:08.000+03:00
diff --git a/handlers/tutorial/client/ebookExtras.js b/handlers/tutorial/client/ebookExtras.js
@@ -1,3 +1,5 @@
+'use strict';
+
 exports.init = function() {
 
   relinkToHeaders();
diff --git a/handlers/tutorial/client/index.js b/handlers/tutorial/client/index.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var delegate = require('client/delegate');
 var prism = require('client/prism');
 var xhr = require('client/xhr');
diff --git a/handlers/tutorial/client/tutorialMap.js b/handlers/tutorial/client/tutorialMap.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var throttle = require('lib/throttle');
 var delegate = require('client/delegate');
 
diff --git a/handlers/tutorial/client/tutorialMapModal.js b/handlers/tutorial/client/tutorialMapModal.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var xhr = require('client/xhr');
 
 var delegate = require('client/delegate');
diff --git a/handlers/tutorial/controller/article.js b/handlers/tutorial/controller/article.js
@@ -1,3 +1,5 @@
+'use strict';
+
 const mongoose = require('mongoose');
 const Article = require('../models/article');
 const Task = require('../models/task');
diff --git a/handlers/tutorial/controller/frontpage.js b/handlers/tutorial/controller/frontpage.js
@@ -1,3 +1,5 @@
+'use strict';
+
 const mongoose = require('mongoose');
 const Article = require('../models/article');
 const Task = require('../models/task');
diff --git a/handlers/tutorial/controller/map.js b/handlers/tutorial/controller/map.js
@@ -1,3 +1,5 @@
+'use strict';
+
 const mongoose = require('mongoose');
 const Article = require('../models/article');
 const Task = require('../models/task');
diff --git a/handlers/tutorial/controller/node.js b/handlers/tutorial/controller/node.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var path = require('path');
 var url = require('url');
 var fs = require('mz/fs');
diff --git a/handlers/tutorial/controller/zipview.js b/handlers/tutorial/controller/zipview.js
@@ -1,3 +1,5 @@
+'use strict';
+
 const Plunk = require('plunk').Plunk;
 const mongoose = require('mongoose');
 
diff --git a/handlers/tutorial/router.js b/handlers/tutorial/router.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var Router = require('koa-router');
 
 var task = require('./controller/task');
diff --git a/handlers/tutorial/tasks/beautify.js b/handlers/tutorial/tasks/beautify.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var co = require('co');
 var fs = require('fs');
 var path = require('path');
diff --git a/handlers/tutorial/tasks/cacheRegenerate.js b/handlers/tutorial/tasks/cacheRegenerate.js
@@ -1,3 +1,5 @@
+'use strict';
+
 const gulp = require('gulp');
 
 const ArticleRenderer = require('../renderer/articleRenderer');
diff --git a/handlers/tutorial/tasks/edit.js b/handlers/tutorial/tasks/edit.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var co = require('co');
 var fs = require('fs');
 var path = require('path');
diff --git a/handlers/tutorial/tasks/figuresImport.js b/handlers/tutorial/tasks/figuresImport.js
@@ -1,3 +1,5 @@
+'use strict';
+
 /**
  * Import figures.sketch into tutorial
  * @type {FiguresImporter|exports}
diff --git a/handlers/tutorial/tasks/import.js b/handlers/tutorial/tasks/import.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var TutorialImporter = require('../tutorialImporter');
 var co = require('co');
 var fs = require('fs');
diff --git a/handlers/tutorial/tasks/importWatch.js b/handlers/tutorial/tasks/importWatch.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var TutorialImporter = require('../tutorialImporter');
 var FiguresImporter = require('../figuresImporter');
 var co = require('co');
diff --git a/handlers/tutorial/tasks/killContent.js b/handlers/tutorial/tasks/killContent.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var co = require('co');
 var Article = require('../models/article');
 var Task = require('../models/task');
diff --git a/handlers/tutorial/tasks/tutorialImport.js b/handlers/tutorial/tasks/tutorialImport.js
@@ -1,3 +1,5 @@
+'use strict';
+
 /**
  * Import tutorial into DB
  * @type {TutorialImporter|exports}
diff --git a/handlers/tutorial/test/fixture/article.js b/handlers/tutorial/test/fixture/article.js
@@ -1,71 +1,73 @@
+'use strict';
+
 const mongoose = require('mongoose');
 
 var ids = [];
-for(var i=0; i<10; i++) ids[i] = new mongoose.Types.ObjectId();
+for (var i = 0; i < 10; i++) ids[i] = new mongoose.Types.ObjectId();
 
 exports.Article = [
   {
-    _id:      ids[0],
-    title:    "Article 1",
-    slug:     "article-1",
-    content:  "Content 1",
-    modified: new Date(2014, 0, 1),
+    _id:        ids[0],
+    title:      "Article 1",
+    slug:       "article-1",
+    content:    "Content 1",
+    modified:   new Date(2014, 0, 1),
     githubLink: 'http://not.exists.com',
-    isFolder: true,
-    weight:   0
+    isFolder:   true,
+    weight:     0
   },
   {
-    _id:      ids[1],
-    title:    "Article 2",
-    slug:     "article-2",
-    content:  "Content 2",
-    modified: new Date(2014, 0, 2),
+    _id:        ids[1],
+    title:      "Article 2",
+    slug:       "article-2",
+    content:    "Content 2",
+    modified:   new Date(2014, 0, 2),
     githubLink: 'http://not.exists.com',
-    isFolder: true,
-    weight:   1
+    isFolder:   true,
+    weight:     1
   },
   {
-    _id:      ids[2],
-    title:    "Article 1.1",
-    slug:     "article-1.1",
-    content:  "Content 1.1",
-    modified: new Date(2014, 0, 2),
-    isFolder: false,
-    weight:   0,
+    _id:        ids[2],
+    title:      "Article 1.1",
+    slug:       "article-1.1",
+    content:    "Content 1.1",
+    modified:   new Date(2014, 0, 2),
+    isFolder:   false,
+    weight:     0,
     githubLink: 'http://not.exists.com',
-    parent:   ids[0]
+    parent:     ids[0]
   },
   {
-    _id:      ids[3],
-    title:    "Article 1.2",
-    slug:     "article-1.2",
-    content:  "Content 1.2",
-    modified: new Date(2014, 0, 3),
-    isFolder: false,
-    weight:   1,
+    _id:        ids[3],
+    title:      "Article 1.2",
+    slug:       "article-1.2",
+    content:    "Content 1.2",
+    modified:   new Date(2014, 0, 3),
+    isFolder:   false,
+    weight:     1,
     githubLink: 'http://not.exists.com',
-    parent:   ids[0]
+    parent:     ids[0]
   },
   {
-    _id:      ids[4],
-    title:    "Article 2.1",
-    slug:     "article-2.1",
-    content:  "Content 2.1",
-    modified: new Date(2014, 0, 4),
-    isFolder: false,
+    _id:        ids[4],
+    title:      "Article 2.1",
+    slug:       "article-2.1",
+    content:    "Content 2.1",
+    modified:   new Date(2014, 0, 4),
+    isFolder:   false,
     githubLink: 'http://not.exists.com',
-    weight:   0,
-    parent:   ids[1]
+    weight:     0,
+    parent:     ids[1]
   },
   {
-    _id:      ids[5],
-    title:    "Article 2.2",
-    slug:     "article-2.2",
-    content:  "Content 2.2",
-    modified: new Date(2014, 0, 5),
-    isFolder: false,
+    _id:        ids[5],
+    title:      "Article 2.2",
+    slug:       "article-2.2",
+    content:    "Content 2.2",
+    modified:   new Date(2014, 0, 5),
+    isFolder:   false,
     githubLink: 'http://not.exists.com',
-    weight:   1,
-    parent:   ids[1]
+    weight:     1,
+    parent:     ids[1]
   }
 ];
diff --git a/handlers/tutorial/test/model/article.js b/handlers/tutorial/test/model/article.js
@@ -1,3 +1,5 @@
+'use strict';
+
 require('app');
 
 var dataUtil = require('lib/dataUtil');
diff --git a/handlers/tutorial/test/renderer/taskRenderer.js b/handlers/tutorial/test/renderer/taskRenderer.js
@@ -1,3 +1,5 @@
+'use strict';
+
 const app = require('app');
 
 const TaskRenderer = require('../../renderer/taskRenderer');
@@ -43,7 +45,7 @@ describe("TaskRenderer", function() {
     const result = yield renderer.renderSolution(task, {});
 
     result.should.be.eql([{title: 'Part 1', content: '<p>Content 1</p>\n'},
-      {title: 'Part 2', content: '<p>Content 2</p>\n'}])
+      {title: 'Part 2', content: '<p>Content 2</p>\n'}]);
 
   });
 });
diff --git a/modules/iprotect/index.js b/modules/iprotect/index.js
@@ -13,36 +13,38 @@ function* protect(name, filePath, targetDir) {
 
   validateName(name);
 
-  yield* del(name);
+  let uniqueName = Date.now().toString();
 
-  log.debug("submit for protect", name, filePath);
+  log.debug("submit for protect", name, uniqueName, filePath);
 
   let options = {
     json:     true,
     formData: {
       file: {
         value:   fs.createReadStream(filePath),
         options: {
-          filename:    name + '.mp4',
+          filename:    uniqueName + '.mp4',
           contentType: 'video/mp4'
         }
       }
     },
     url:      config.iprotect.url.upload
   };
 
+  //console.log(options);
+
   let response = yield request.post(options);
 
   log.debug("response", response);
   log.debug("waiting for protect", filePath);
 
   let date = Date.now();
 
-  let protectedPath = `${tmpRoot}/${name}.zip`;
+  let protectedPath = `${tmpRoot}/${uniqueName}.zip`;
 
   while (Date.now() < date + 120 * 1e3) { // wait 120 secounds
 
-    let req = request(config.iprotect.url.files + '/' + name + '_protected.zip');
+    let req = request(config.iprotect.url.files + '/' + uniqueName + '_protected.zip');
     req.pipe(fs.createWriteStream(protectedPath));
 
     log.debug(req.path);
@@ -51,7 +53,7 @@ function* protect(name, filePath, targetDir) {
       let res = yield req;
 
       // wow downloaded!
-      yield* del(name);
+      yield* del(uniqueName);
 
       break;
 
@@ -61,19 +63,19 @@ function* protect(name, filePath, targetDir) {
       // otherwise, error
       if (e.statusCode != 404) {
         // ouch! strange error!
-        log.error("iprotect upload", name, e);
+        log.error("iprotect upload", name, uniqueName, e);
         throw new Error("iprotect upload check failed: " + e.statusCode + '\n' + e.message);
       }
     }
 
     // check for name.err file, to see if the conversion failed
     let errorDescription;
     try {
-      errorDescription = yield request(config.iprotect.url.files + '/' + name + '.err');
+      errorDescription = yield request(config.iprotect.url.files + '/' + uniqueName + '.err');
     } catch (e) {
       if (e.statusCode != 404) {
         // ouch! strange error!
-        log.error("iprotect upload", name, e);
+        log.error("iprotect upload", name, uniqueName, e);
         throw new Error("iprotect err check failed: " + e.statusCode + '\n' + e.message);
       }
     }
@@ -95,14 +97,17 @@ function* protect(name, filePath, targetDir) {
       if (stderr) {
         callback(new Error(stderr));
       } else {
+        fs.renameSync(targetDir + '/' + uniqueName + '.app', targetDir + '/' + name + '.app');
+        fs.renameSync(targetDir + '/' + uniqueName + '.exe', targetDir + '/' + name + '.exe');
+        fs.renameSync(targetDir + '/data/' + uniqueName + '.ipr', targetDir + '/data/' + name + '.ipr');
         callback(null, stdout);
       }
     });
   };
 
   log.debug("unzipped", protectedPath, filePath);
 
-  yield* del(name);
+  yield* del(uniqueName);
 
   yield fs.unlink(protectedPath); // strange bluebird/cls warning if I yield unlink
 

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+'use strict';`
	`2`	`+`
`1`	`3`	`exports.init = function() {`
`2`	`4`
`3`	`5`	`relinkToHeaders();`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+'use strict';`
	`2`	`+`
`1`	`3`	`var delegate = require('client/delegate');`
`2`	`4`	`var prism = require('client/prism');`
`3`	`5`	`var xhr = require('client/xhr');`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+'use strict';`
	`2`	`+`
`1`	`3`	`var throttle = require('lib/throttle');`
`2`	`4`	`var delegate = require('client/delegate');`
`3`	`5`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+'use strict';`
	`2`	`+`
`1`	`3`	`const mongoose = require('mongoose');`
`2`	`4`	`const Article = require('../models/article');`
`3`	`5`	`const Task = require('../models/task');`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+'use strict';`
	`2`	`+`
`1`	`3`	`var path = require('path');`
`2`	`4`	`var url = require('url');`
`3`	`5`	`var fs = require('mz/fs');`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+'use strict';`
	`2`	`+`
`1`	`3`	`const Plunk = require('plunk').Plunk;`
`2`	`4`	`const mongoose = require('mongoose');`
`3`	`5`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+'use strict';`
	`2`	`+`
`1`	`3`	`var Router = require('koa-router');`
`2`	`4`
`3`	`5`	`var task = require('./controller/task');`