Delete within a filer folder working #3

phcode-dev · Oct 11, 2021 · c1ace0a · c1ace0a
1 parent ce135e4
commit c1ace0a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/src/phoenix/fslib.js b/src/phoenix/fslib.js
@@ -32,6 +32,7 @@ import Constants from "./constants.js";
 import Mounts from "./fslib_mounts.js";
 
 let filerLib = null;
+let filerShell = null;
 
 /**
  * Offers functionality similar to mkdir -p
@@ -114,8 +115,8 @@ const fileSystemLib = {
     rename: function (...args) {
         return filerLib.fs.rename(...args);
     },
-    unlink: function (...args) {
-        return filerLib.fs.unlink(...args);
+    unlink: function (path, cb) {
+        return filerShell.rm(path, { recursive: true }, cb);
     },
     showSaveDialog: function () {
         throw new Errors.ENOSYS('Phoenix fs showSaveDialog function not yet supported.');
@@ -146,6 +147,7 @@ const fileSystemLib = {
 
 export default function initFsLib(Phoenix, FilerLib) {
     filerLib = FilerLib;
+    filerShell = new filerLib.fs.Shell();
     window.path = FilerLib.path;
     window.fs = fileSystemLib;
 

diff --git a/src/preferences/PreferencesBase.js b/src/preferences/PreferencesBase.js
@@ -182,7 +182,7 @@ define(function (require, exports, module) {
                         if (createIfMissing) {
                             // Unreadable file is also unwritable -- delete so get recreated
                             if (recreateIfInvalid && (err === FileSystemError.NOT_READABLE || err === FileSystemError.UNSUPPORTED_ENCODING)) {
-                                appshell.fs.moveToTrash(path, function (err) {
+                                appshell.fs.unlink(path, function (err) {
                                     if (err) {
                                         console.log("Cannot move unreadable preferences file " + path + " to trash!!");
                                     } else {
@@ -208,7 +208,7 @@ define(function (require, exports, module) {
                         } catch (e) {
                             if (recreateIfInvalid) {
                                 // JSON parsing error -- recreate the preferences file
-                                appshell.fs.moveToTrash(path, function (err) {
+                                appshell.fs.unlink(path, function (err) {
                                     if (err) {
                                         console.log("Cannot move unparseable preferences file " + path + " to trash!!");
                                     } else {

diff --git a/src/project/ProjectManager.js b/src/project/ProjectManager.js
@@ -1142,7 +1142,7 @@ define(function (require, exports, module) {
     function deleteItem(entry) {
         var result = new $.Deferred();
 
-        entry.moveToTrash(function (err) {
+        entry.unlink(function (err) {
             if (!err) {
                 DocumentManager.notifyPathDeleted(entry.fullPath);
                 result.resolve();