fix syncView problem when importing an example from task

iliakan · iliakan · commit 598e8f4284bf · 2015-02-15T14:58:48.000+03:00
diff --git a/edit b/edit
@@ -1,4 +1,4 @@
 #!/bin/bash
 
-TUTORIAL_ROOT=/js/javascript-tutorial NODE_ENV=production gulp edit --harmony
+TUTORIAL_ROOT=/js/javascript-tutorial gulp edit --harmony
 
diff --git a/handlers/tutorial/tasks/importWatch.js b/handlers/tutorial/tasks/importWatch.js
@@ -61,7 +61,7 @@ function watchTutorial(root) {
   function onTutorialModify(isDir, filePath) {
     if (~filePath.indexOf('___jb_')) return; // ignore JetBrains Webstorm tmp files
 
-    console.log("ImportWatch Modify " + filePath);
+    log.debug("ImportWatch Modify " + filePath);
 
     co(function* () {
 
@@ -75,7 +75,7 @@ function watchTutorial(root) {
       yield* importer.sync(folder);
 
     }).catch(function(err) {
-      throw err;
+      log.error(err);
     });
   }
 
diff --git a/handlers/tutorial/tutorialImporter.js b/handlers/tutorial/tutorialImporter.js
@@ -34,7 +34,7 @@ TutorialImporter.prototype.sync = function* (directory) {
   var dir = fs.realpathSync(directory);
   var type;
   while (true) {
-    if (dir.endsWith('.view')) {
+    if (dir.endsWith('.view') && !dir.endsWith('/_js.view')) {
       type = 'View';
       break;
     }
@@ -63,8 +63,12 @@ TutorialImporter.prototype.sync = function* (directory) {
   var parentSlug = path.basename(parentDir);
   parentSlug = parentSlug.slice(parentSlug.indexOf('-') + 1);
 
-  var parent = yield Article.findOne({slug: parentSlug}).exec();
-
+  var parent;
+  if (fs.existsSync(path.join(parentDir, 'task.md'))) {
+    parent = yield Task.findOne({slug: parentSlug}).exec();
+  } else {
+    parent = yield Article.findOne({slug: parentSlug}).exec();
+  }
   yield* this['sync' + type](dir, parent);
 
 };
@@ -305,10 +309,11 @@ function* importImage(srcPath, dstDir) {
 
 function copySync(srcPath, dstPath) {
   if (checkSameMtime(srcPath, dstPath)) {
+    log.debug("copySync: same mtime %s = %s", srcPath, dstPath);
     return;
   }
 
-  log.debug("Copy %s to %s", srcPath, dstPath);
+  log.debug("copySync %s -> %s", srcPath, dstPath);
 
   fse.copySync(srcPath, dstPath);
 }
@@ -384,18 +389,15 @@ TutorialImporter.prototype.syncTask = function*(taskPath, parent) {
 
 TutorialImporter.prototype.syncView = function*(dir, parent) {
 
-  log.info("syncView", dir);
-
+  log.info("syncView: dir", dir);
   var pathName = path.basename(dir).replace('.view', '');
-
   if (pathName == '_js') {
     throw new Error("Must not syncView " + pathName);
   }
 
   var webPath = parent.getResourceWebRoot() + '/' + pathName;
 
   log.debug("syncView webpath", webPath);
-
   var plunk = yield Plunk.findOne({webPath: webPath}).exec();
 
   if (plunk) {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`	`1`	`#!/bin/bash`
`2`	`2`
`3`		`-TUTORIAL_ROOT=/js/javascript-tutorial NODE_ENV=production gulp edit --harmony`
	`3`	`+TUTORIAL_ROOT=/js/javascript-tutorial gulp edit --harmony`
`4`	`4`