Drag and drop move operations on native project folders working #3

phcode-dev · Oct 20, 2021 · 34f3b2f · 34f3b2f
1 parent 812a49a
commit 34f3b2f
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/src/phoenix/fslib.js b/src/phoenix/fslib.js
@@ -112,8 +112,13 @@ const fileSystemLib = {
         }
         return filerLib.fs.mkdir(...args);
     },
-    rename: function (...args) {
-        return filerLib.fs.rename(...args);
+    rename: function (oldPath, newPath, cb) {
+        if(Mounts.isMountPath(oldPath) || Mounts.isMountPath(newPath)) {
+            throw new Errors.EPERM('Mount root directory cannot be deleted.');
+        } else if(Mounts.isMountSubPath(oldPath) && Mounts.isMountSubPath(newPath)) {
+            return NativeFS.rename(oldPath, newPath, cb);
+        }
+        return filerLib.fs.rename(oldPath, newPath, cb);
     },
     unlink: function (path, cb) {
         if(Mounts.isMountPath(path)) {

diff --git a/src/phoenix/fslib_native.js b/src/phoenix/fslib_native.js
@@ -328,6 +328,18 @@ async function copy(src, dst, callback, recursive = true) {
     });
 }
 
+async function rename(oldPath, newPath, cb) {
+    copy(oldPath, newPath, err => {
+        if(err) {
+            cb(err);
+        } else {
+            setTimeout(()=>{
+                unlink(oldPath, cb);
+            }, 0);
+        }
+    });
+}
+
 function mountNativeFolder(...args) {
     Mounts.mountNativeFolder(...args);
 }
@@ -345,7 +357,8 @@ const NativeFS = {
     readFile,
     writeFile,
     unlink,
-    copy
+    copy,
+    rename
 };
 
 export default NativeFS;