fix x-device move

iliakan · iliakan · commit 07cf567187e7 · 2016-02-02T21:52:23.000+03:00
diff --git a/handlers/courses/controller/groupMaterials.js b/handlers/courses/controller/groupMaterials.js
@@ -124,7 +124,7 @@ exports.post = function*() {
     // error, so delete all tmp files
     for (var i = 0; i < files.length; i++) {
       var file = files[i];
-      fs.unlinkSync(file.path);
+      yield fs.unlink(file.path);
     }
     this.addFlashMessage('error', e.message);
     this.redirect(this.originalUrl);
@@ -142,7 +142,7 @@ exports.post = function*() {
   for (let i = 0; i < files.length; i++) {
     let file = files[i];
     let originalFilename = transliterate(file.originalFilename).replace(/[^\d\w_.-]/gim, '');
-    fs.renameSync(file.path, path.join(archiveDir, originalFilename));
+    yield* move(file.path, path.join(archiveDir, originalFilename));
     this.log.debug("Moved to archive", file.path, '->', path.join(archiveDir, originalFilename));
   }
 
@@ -153,7 +153,7 @@ exports.post = function*() {
     fse.ensureDir(path.dirname(filePath), callback);
   };
 
-  fs.renameSync(processedMaterialsZip, filePath);
+  yield* move(processedMaterialsZip, filePath);
 
   this.log.debug("Moved zipped result to", filePath);
 
@@ -281,3 +281,10 @@ function* processFiles(name, files) {
   return workingDir + '.zip';
 
 }
+
+function* move(src, dst) {
+  yield function(callback) {
+    fse.copy(src, dst, callback);
+  };
+  yield fs.unlink(src);
+}
diff --git a/modules/iprotect/index.js b/modules/iprotect/index.js
@@ -100,7 +100,7 @@ function* protect(name, filePath, targetDir) {
 
   yield* del(name);
 
-  fs.unlinkSync(protectedPath); // strange bluebird/cls warning if I yield unlink
+  yield fs.unlink(protectedPath); // strange bluebird/cls warning if I yield unlink
 
 }
 

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ function* protect(name, filePath, targetDir) {`
`100`	`100`
`101`	`101`	`yield* del(name);`
`102`	`102`
`103`		`- fs.unlinkSync(protectedPath); // strange bluebird/cls warning if I yield unlink`
	`103`	`+ yield fs.unlink(protectedPath); // strange bluebird/cls warning if I yield unlink`
`104`	`104`
`105`	`105`	`}`
`106`	`106`