occam-file-system 5.0.91 → 5.0.93

package/lib/renameProjectEntry.js

@@ -2,34 +2,104 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-Object.defineProperty(exports, "default", {
-    enumerable: true,
-    get: function() {
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: all[name]
+    });
+}
+_export(exports, {
+    default: function() {
         return renameProjectEntry;
+    },
+    renameEntryOperation: function() {
+        return renameEntryOperation;
     }
 });
+var _fsExtra = require("fs-extra");
 var _necessary = require("necessary");
-var _moveProjectEntries = require("./moveProjectEntries");
-var last = _necessary.arrayUtilities.last;
+var last = _necessary.arrayUtilities.last, concatenatePaths = _necessary.pathUtilities.concatenatePaths, checkEntryExists = _necessary.fileSystemUtilities.checkEntryExists, isEntryDirectory = _necessary.fileSystemUtilities.isEntryDirectory;
 function renameProjectEntry(projectsDirectoryPath, json, callback) {
     var pathMaps = json.pathMaps, lastPathMap = last(pathMaps), pathMap = lastPathMap, sourceEntryPath = pathMap.sourceEntryPath, targetEntryPath = pathMap.targetEntryPath;
-    (0, _moveProjectEntries.moveEntryOperation)(sourceEntryPath, targetEntryPath, projectsDirectoryPath, function(sourceEntryPath, targetEntryPath) {
-        var sourceEntryPaths = pathMaps.map(function(pathMap) {
-            if (sourceEntryPath !== null) {
-                sourceEntryPath = pathMap.sourceEntryPath;
+    renameEntryOperation(sourceEntryPath, targetEntryPath, projectsDirectoryPath, function(sourceEntryPath, targetEntryPath) {
+        var entryMissing = sourceEntryPath === null, entryUnmoved = sourceEntryPath === targetEntryPath, sourceEntryPaths = [], targetEntryPaths = [];
+        pathMaps.forEach(function(pathMap) {
+            var _$sourceEntryPath, _$targetEntryPath;
+            if (false) {
+            ///
+            } else if (entryMissing) {
+                _$sourceEntryPath = null;
+                _$targetEntryPath = pathMap.targetEntryPath;
+            } else if (entryUnmoved) {
+                _$sourceEntryPath = pathMap.sourceEntryPath;
+                _$targetEntryPath = _$sourceEntryPath; ///
+            } else {
+                var ref;
+                ref = pathMap, _$sourceEntryPath = ref.sourceEntryPath, _$targetEntryPath = ref.targetEntryPath, ref;
             }
-            return sourceEntryPath;
-        }), targetEntryPaths = pathMaps.map(function(pathMap) {
-            if (targetEntryPath !== null) {
-                targetEntryPath = pathMap.targetEntryPath;
-            }
-            return targetEntryPath;
-        }), _$json = {
+            sourceEntryPaths.push(_$sourceEntryPath);
+            targetEntryPaths.push(_$targetEntryPath);
+        });
+        var _$json = {
             sourceEntryPaths: sourceEntryPaths,
             targetEntryPaths: targetEntryPaths
         };
         callback(_$json);
     });
 }
+function renameEntryOperation(sourceEntryPath, targetEntryPath, projectsDirectoryPath, callback) {
+    var absoluteSourceEntryPath = concatenatePaths(projectsDirectoryPath, sourceEntryPath), entryDirectory = isEntryDirectory(absoluteSourceEntryPath);
+    entryDirectory ? renameDirectoryOperation(sourceEntryPath, targetEntryPath, projectsDirectoryPath, callback) : renameFileOperation(sourceEntryPath, targetEntryPath, projectsDirectoryPath, callback);
+}
+function renameFileOperation(sourceEntryPath, targetEntryPath, projectsDirectoryPath, callback) {
+    var sourceFilePath = sourceEntryPath, targetFilePath = targetEntryPath; ///
+    if (sourceFilePath === targetFilePath) {
+        callback(sourceEntryPath, targetEntryPath);
+        return;
+    }
+    var absoluteSourceFilePath = concatenatePaths(projectsDirectoryPath, sourceFilePath), sourceFileExists = checkEntryExists(absoluteSourceFilePath);
+    if (!sourceFileExists) {
+        sourceEntryPath = null;
+        callback(sourceEntryPath, targetEntryPath);
+        return;
+    }
+    var absoluteTargetFilePath = concatenatePaths(projectsDirectoryPath, targetFilePath), targetFileExists = checkEntryExists(absoluteTargetFilePath);
+    if (targetFileExists) {
+        targetEntryPath = sourceEntryPath; ///
+        callback(sourceEntryPath, targetEntryPath);
+        return;
+    }
+    (0, _fsExtra.move)(absoluteSourceFilePath, absoluteTargetFilePath, function(error) {
+        if (error) {
+            targetEntryPath = sourceEntryPath; ///
+        }
+        callback(sourceEntryPath, targetEntryPath);
+    });
+}
+function renameDirectoryOperation(sourceEntryPath, targetEntryPath, projectsDirectoryPath, callback) {
+    var sourceDirectoryPath = sourceEntryPath, targetDirectoryPath = targetEntryPath; //
+    if (sourceDirectoryPath === targetDirectoryPath) {
+        callback(sourceEntryPath, targetEntryPath);
+        return;
+    }
+    var absoluteSourceDirectoryPath = concatenatePaths(projectsDirectoryPath, sourceDirectoryPath), sourceDirectoryExists = checkEntryExists(absoluteSourceDirectoryPath);
+    if (!sourceDirectoryExists) {
+        sourceEntryPath = null;
+        callback(sourceEntryPath, targetEntryPath);
+        return;
+    }
+    var absoluteTargetDirectoryPath = concatenatePaths(projectsDirectoryPath, targetDirectoryPath), targetDirectoryExists = checkEntryExists(absoluteTargetDirectoryPath);
+    if (targetDirectoryExists) {
+        targetEntryPath = sourceEntryPath; ///
+        callback(sourceEntryPath, targetEntryPath);
+        return;
+    }
+    (0, _fsExtra.move)(absoluteSourceDirectoryPath, absoluteTargetDirectoryPath, function(error) {
+        if (error) {
+            targetEntryPath = sourceEntryPath; ///
+        }
+        callback(sourceEntryPath, targetEntryPath);
+    });
+}
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9yZW5hbWVQcm9qZWN0RW50cnkuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCB7IGFycmF5VXRpbGl0aWVzIH0gZnJvbSBcIm5lY2Vzc2FyeVwiO1xuXG5pbXBvcnQgeyBtb3ZlRW50cnlPcGVyYXRpb24gfSBmcm9tIFwiLi9tb3ZlUHJvamVjdEVudHJpZXNcIjtcblxuY29uc3QgeyBsYXN0IH0gPSBhcnJheVV0aWxpdGllcztcblxuZXhwb3J0IGRlZmF1bHQgZnVuY3Rpb24gcmVuYW1lUHJvamVjdEVudHJ5KHByb2plY3RzRGlyZWN0b3J5UGF0aCwganNvbiwgY2FsbGJhY2spIHtcbiAgY29uc3QgeyBwYXRoTWFwcyB9ID0ganNvbixcbiAgICAgICAgbGFzdFBhdGhNYXAgPSBsYXN0KHBhdGhNYXBzKSxcbiAgICAgICAgcGF0aE1hcCA9IGxhc3RQYXRoTWFwLCAgLy8vXG4gICAgICAgIHsgc291cmNlRW50cnlQYXRoLCB0YXJnZXRFbnRyeVBhdGggfSA9IHBhdGhNYXA7XG5cbiAgbW92ZUVudHJ5T3BlcmF0aW9uKHNvdXJjZUVudHJ5UGF0aCwgdGFyZ2V0RW50cnlQYXRoLCBwcm9qZWN0c0RpcmVjdG9yeVBhdGgsIChzb3VyY2VFbnRyeVBhdGgsIHRhcmdldEVudHJ5UGF0aCkgPT4ge1xuICAgIGNvbnN0IHNvdXJjZUVudHJ5UGF0aHMgPSBwYXRoTWFwcy5tYXAoKHBhdGhNYXApID0+IHtcbiAgICAgICAgICAgIGlmIChzb3VyY2VFbnRyeVBhdGggIT09IG51bGwpIHtcbiAgICAgICAgICAgICAgKHsgc291cmNlRW50cnlQYXRoIH0gPSBwYXRoTWFwKTtcbiAgICAgICAgICAgIH1cblxuICAgICAgICAgICAgcmV0dXJuIHNvdXJjZUVudHJ5UGF0aDtcbiAgICAgICAgICB9KSxcbiAgICAgICAgICB0YXJnZXRFbnRyeVBhdGhzID0gcGF0aE1hcHMubWFwKChwYXRoTWFwKSA9PiB7XG4gICAgICAgICAgICBpZiAodGFyZ2V0RW50cnlQYXRoICE9PSBudWxsKSB7XG4gICAgICAgICAgICAgICh7IHRhcmdldEVudHJ5UGF0aCB9ID0gcGF0aE1hcCk7XG4gICAgICAgICAgICB9XG5cbiAgICAgICAgICAgIHJldHVybiB0YXJnZXRFbnRyeVBhdGg7XG4gICAgICAgICAgfSksXG4gICAgICAgICAganNvbiA9IHtcbiAgICAgICAgICAgIHNvdXJjZUVudHJ5UGF0aHMsXG4gICAgICAgICAgICB0YXJnZXRFbnRyeVBhdGhzXG4gICAgICAgICAgfTtcblxuICAgIGNhbGxiYWNrKGpzb24pO1xuICB9KTtcbn1cbiJdLCJuYW1lcyI6WyJyZW5hbWVQcm9qZWN0RW50cnkiLCJsYXN0IiwiYXJyYXlVdGlsaXRpZXMiLCJwcm9qZWN0c0RpcmVjdG9yeVBhdGgiLCJqc29uIiwiY2FsbGJhY2siLCJwYXRoTWFwcyIsImxhc3RQYXRoTWFwIiwicGF0aE1hcCIsInNvdXJjZUVudHJ5UGF0aCIsInRhcmdldEVudHJ5UGF0aCIsIm1vdmVFbnRyeU9wZXJhdGlvbiIsInNvdXJjZUVudHJ5UGF0aHMiLCJtYXAiLCJ0YXJnZXRFbnRyeVBhdGhzIl0sIm1hcHBpbmdzIjoiQUFBQTs7OzsrQkFRQTs7O2VBQXdCQTs7O3lCQU5PO2tDQUVJO0FBRW5DLElBQU0sQUFBRUMsT0FBU0MseUJBQWMsQ0FBdkJEO0FBRU8sU0FBU0QsbUJBQW1CRyxxQkFBcUIsRUFBRUMsSUFBSSxFQUFFQyxRQUFRLEVBQUU7SUFDaEYsSUFBTSxBQUFFQyxXQUFhRixLQUFiRSxVQUNGQyxjQUFjTixLQUFLSyxXQUNuQkUsVUFBVUQsYUFDUkUsa0JBQXFDRCxRQUFyQ0MsaUJBQWlCQyxrQkFBb0JGLFFBQXBCRTtJQUV6QkMsSUFBQUEsc0NBQWtCLEVBQUNGLGlCQUFpQkMsaUJBQWlCUCx1QkFBdUIsU0FBQ00saUJBQWlCQyxpQkFBb0I7UUFDaEgsSUFBTUUsbUJBQW1CTixTQUFTTyxHQUFHLENBQUMsU0FBQ0wsU0FBWTtZQUMzQyxJQUFJQyxvQkFBb0IsSUFBSSxFQUFFO2dCQUN6QkEsa0JBQW9CRCxRQUFwQkM7WUFDTCxDQUFDO1lBRUQsT0FBT0E7UUFDVCxJQUNBSyxtQkFBbUJSLFNBQVNPLEdBQUcsQ0FBQyxTQUFDTCxTQUFZO1lBQzNDLElBQUlFLG9CQUFvQixJQUFJLEVBQUU7Z0JBQ3pCQSxrQkFBb0JGLFFBQXBCRTtZQUNMLENBQUM7WUFFRCxPQUFPQTtRQUNULElBQ0FOLFNBQU87WUFDTFEsa0JBQUFBO1lBQ0FFLGtCQUFBQTtRQUNGO1FBRU5ULFNBQVNEO0lBQ1g7QUFDRiJ9
+//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../src/renameProjectEntry.js"],"sourcesContent":["\"use strict\";\n\nimport { move as rename } from \"fs-extra\";\nimport { arrayUtilities } from \"necessary\";\nimport { pathUtilities, fileSystemUtilities } from \"necessary\";\n\nconst { last } = arrayUtilities,\n      { concatenatePaths } = pathUtilities,\n      { checkEntryExists, isEntryDirectory } = fileSystemUtilities;\n\nexport default function renameProjectEntry(projectsDirectoryPath, json, callback) {\n  const { pathMaps } = json,\n        lastPathMap = last(pathMaps),\n        pathMap = lastPathMap,  ///\n        { sourceEntryPath, targetEntryPath } = pathMap;\n\n  renameEntryOperation(sourceEntryPath, targetEntryPath, projectsDirectoryPath, (sourceEntryPath, targetEntryPath) => {\n    const entryMissing = (sourceEntryPath === null),\n          entryUnmoved = (sourceEntryPath === targetEntryPath),\n          sourceEntryPaths = [],\n          targetEntryPaths = [];\n\n    pathMaps.forEach((pathMap) => {\n      let sourceEntryPath,\n          targetEntryPath;\n\n      if (false) {\n        ///\n      } else if (entryMissing) {\n        sourceEntryPath = null;\n\n        ({ targetEntryPath } = pathMap);\n      } else if (entryUnmoved) {\n        ({ sourceEntryPath } = pathMap);\n\n        targetEntryPath = sourceEntryPath;  ///\n      } else {\n        ({ sourceEntryPath, targetEntryPath } = pathMap);\n      }\n\n      sourceEntryPaths.push(sourceEntryPath);\n      targetEntryPaths.push(targetEntryPath);\n    });\n\n    const json = {\n      sourceEntryPaths,\n      targetEntryPaths\n    };\n\n    callback(json);\n  });\n}\n\nexport function renameEntryOperation(sourceEntryPath, targetEntryPath, projectsDirectoryPath, callback) {\n  const absoluteSourceEntryPath = concatenatePaths(projectsDirectoryPath, sourceEntryPath),\n        entryDirectory = isEntryDirectory(absoluteSourceEntryPath);\n\n  entryDirectory ?\n    renameDirectoryOperation(sourceEntryPath, targetEntryPath, projectsDirectoryPath, callback) :\n      renameFileOperation(sourceEntryPath, targetEntryPath, projectsDirectoryPath, callback);\n}\n\nfunction renameFileOperation(sourceEntryPath, targetEntryPath, projectsDirectoryPath, callback) {\n  const sourceFilePath = sourceEntryPath,  ///\n        targetFilePath = targetEntryPath;  ///\n\n  if (sourceFilePath === targetFilePath) {\n    callback(sourceEntryPath, targetEntryPath);\n\n    return;\n  }\n\n  const absoluteSourceFilePath = concatenatePaths(projectsDirectoryPath, sourceFilePath),\n        sourceFileExists = checkEntryExists(absoluteSourceFilePath);\n\n  if (!sourceFileExists) {\n    sourceEntryPath = null;\n\n    callback(sourceEntryPath, targetEntryPath);\n\n    return;\n  }\n\n  const absoluteTargetFilePath = concatenatePaths(projectsDirectoryPath, targetFilePath),\n        targetFileExists = checkEntryExists(absoluteTargetFilePath);\n\n  if (targetFileExists) {\n    targetEntryPath = sourceEntryPath;  ///\n\n    callback(sourceEntryPath, targetEntryPath);\n\n    return;\n  }\n\n  rename(absoluteSourceFilePath, absoluteTargetFilePath, (error) => {\n    if (error) {\n      targetEntryPath = sourceEntryPath;  ///\n    }\n\n    callback(sourceEntryPath, targetEntryPath);\n  });\n}\n\nfunction renameDirectoryOperation(sourceEntryPath, targetEntryPath, projectsDirectoryPath, callback) {\n  const sourceDirectoryPath = sourceEntryPath, ///\n        targetDirectoryPath = targetEntryPath; //\n\n  if (sourceDirectoryPath === targetDirectoryPath) {\n    callback(sourceEntryPath, targetEntryPath);\n\n    return;\n  }\n\n  const absoluteSourceDirectoryPath = concatenatePaths(projectsDirectoryPath, sourceDirectoryPath),\n        sourceDirectoryExists = checkEntryExists(absoluteSourceDirectoryPath);\n\n  if (!sourceDirectoryExists) {\n    sourceEntryPath = null;\n\n    callback(sourceEntryPath, targetEntryPath);\n\n    return;\n  }\n\n  const absoluteTargetDirectoryPath = concatenatePaths(projectsDirectoryPath, targetDirectoryPath),\n        targetDirectoryExists = checkEntryExists(absoluteTargetDirectoryPath);\n\n  if (targetDirectoryExists) {\n    targetEntryPath = sourceEntryPath;  ///\n\n    callback(sourceEntryPath, targetEntryPath);\n\n    return;\n  }\n\n  rename(absoluteSourceDirectoryPath, absoluteTargetDirectoryPath, (error) => {\n    if (error) {\n      targetEntryPath = sourceEntryPath;  ///\n    }\n\n    callback(sourceEntryPath, targetEntryPath);\n  });\n}\n"],"names":["renameProjectEntry","renameEntryOperation","last","arrayUtilities","concatenatePaths","pathUtilities","checkEntryExists","fileSystemUtilities","isEntryDirectory","projectsDirectoryPath","json","callback","pathMaps","lastPathMap","pathMap","sourceEntryPath","targetEntryPath","entryMissing","entryUnmoved","sourceEntryPaths","targetEntryPaths","forEach","push","absoluteSourceEntryPath","entryDirectory","renameDirectoryOperation","renameFileOperation","sourceFilePath","targetFilePath","absoluteSourceFilePath","sourceFileExists","absoluteTargetFilePath","targetFileExists","rename","error","sourceDirectoryPath","targetDirectoryPath","absoluteSourceDirectoryPath","sourceDirectoryExists","absoluteTargetDirectoryPath","targetDirectoryExists"],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "occam-file-system",
   "author": "James Smith",
-  "version": "5.0.91",
+  "version": "5.0.93",
   "license": "MIT, Anti-996",
   "homepage": "https://github.com/djalbat/occam-file-system",
   "description": "Occam's file system functionality.",

package/src/renameProjectEntry.js

@@ -1,10 +1,12 @@
 "use strict";
 
+import { move as rename } from "fs-extra";
 import { arrayUtilities } from "necessary";
+import { pathUtilities, fileSystemUtilities } from "necessary";
 
-import { moveEntryOperation } from "./moveProjectEntries";
-
-const { last } = arrayUtilities;
+const { last } = arrayUtilities,
+      { concatenatePaths } = pathUtilities,
+      { checkEntryExists, isEntryDirectory } = fileSystemUtilities;
 
 export default function renameProjectEntry(projectsDirectoryPath, json, callback) {
   const { pathMaps } = json,
@@ -12,26 +14,130 @@ export default function renameProjectEntry(projectsDirectoryPath, json, callback
         pathMap = lastPathMap,  ///
         { sourceEntryPath, targetEntryPath } = pathMap;
 
-  moveEntryOperation(sourceEntryPath, targetEntryPath, projectsDirectoryPath, (sourceEntryPath, targetEntryPath) => {
-    const sourceEntryPaths = pathMaps.map((pathMap) => {
-            if (sourceEntryPath !== null) {
-              ({ sourceEntryPath } = pathMap);
-            }
-
-            return sourceEntryPath;
-          }),
-          targetEntryPaths = pathMaps.map((pathMap) => {
-            if (targetEntryPath !== null) {
-              ({ targetEntryPath } = pathMap);
-            }
-
-            return targetEntryPath;
-          }),
-          json = {
-            sourceEntryPaths,
-            targetEntryPaths
-          };
+  renameEntryOperation(sourceEntryPath, targetEntryPath, projectsDirectoryPath, (sourceEntryPath, targetEntryPath) => {
+    const entryMissing = (sourceEntryPath === null),
+          entryUnmoved = (sourceEntryPath === targetEntryPath),
+          sourceEntryPaths = [],
+          targetEntryPaths = [];
+
+    pathMaps.forEach((pathMap) => {
+      let sourceEntryPath,
+          targetEntryPath;
+
+      if (false) {
+        ///
+      } else if (entryMissing) {
+        sourceEntryPath = null;
+
+        ({ targetEntryPath } = pathMap);
+      } else if (entryUnmoved) {
+        ({ sourceEntryPath } = pathMap);
+
+        targetEntryPath = sourceEntryPath;  ///
+      } else {
+        ({ sourceEntryPath, targetEntryPath } = pathMap);
+      }
+
+      sourceEntryPaths.push(sourceEntryPath);
+      targetEntryPaths.push(targetEntryPath);
+    });
+
+    const json = {
+      sourceEntryPaths,
+      targetEntryPaths
+    };
 
     callback(json);
   });
 }
+
+export function renameEntryOperation(sourceEntryPath, targetEntryPath, projectsDirectoryPath, callback) {
+  const absoluteSourceEntryPath = concatenatePaths(projectsDirectoryPath, sourceEntryPath),
+        entryDirectory = isEntryDirectory(absoluteSourceEntryPath);
+
+  entryDirectory ?
+    renameDirectoryOperation(sourceEntryPath, targetEntryPath, projectsDirectoryPath, callback) :
+      renameFileOperation(sourceEntryPath, targetEntryPath, projectsDirectoryPath, callback);
+}
+
+function renameFileOperation(sourceEntryPath, targetEntryPath, projectsDirectoryPath, callback) {
+  const sourceFilePath = sourceEntryPath,  ///
+        targetFilePath = targetEntryPath;  ///
+
+  if (sourceFilePath === targetFilePath) {
+    callback(sourceEntryPath, targetEntryPath);
+
+    return;
+  }
+
+  const absoluteSourceFilePath = concatenatePaths(projectsDirectoryPath, sourceFilePath),
+        sourceFileExists = checkEntryExists(absoluteSourceFilePath);
+
+  if (!sourceFileExists) {
+    sourceEntryPath = null;
+
+    callback(sourceEntryPath, targetEntryPath);
+
+    return;
+  }
+
+  const absoluteTargetFilePath = concatenatePaths(projectsDirectoryPath, targetFilePath),
+        targetFileExists = checkEntryExists(absoluteTargetFilePath);
+
+  if (targetFileExists) {
+    targetEntryPath = sourceEntryPath;  ///
+
+    callback(sourceEntryPath, targetEntryPath);
+
+    return;
+  }
+
+  rename(absoluteSourceFilePath, absoluteTargetFilePath, (error) => {
+    if (error) {
+      targetEntryPath = sourceEntryPath;  ///
+    }
+
+    callback(sourceEntryPath, targetEntryPath);
+  });
+}
+
+function renameDirectoryOperation(sourceEntryPath, targetEntryPath, projectsDirectoryPath, callback) {
+  const sourceDirectoryPath = sourceEntryPath, ///
+        targetDirectoryPath = targetEntryPath; //
+
+  if (sourceDirectoryPath === targetDirectoryPath) {
+    callback(sourceEntryPath, targetEntryPath);
+
+    return;
+  }
+
+  const absoluteSourceDirectoryPath = concatenatePaths(projectsDirectoryPath, sourceDirectoryPath),
+        sourceDirectoryExists = checkEntryExists(absoluteSourceDirectoryPath);
+
+  if (!sourceDirectoryExists) {
+    sourceEntryPath = null;
+
+    callback(sourceEntryPath, targetEntryPath);
+
+    return;
+  }
+
+  const absoluteTargetDirectoryPath = concatenatePaths(projectsDirectoryPath, targetDirectoryPath),
+        targetDirectoryExists = checkEntryExists(absoluteTargetDirectoryPath);
+
+  if (targetDirectoryExists) {
+    targetEntryPath = sourceEntryPath;  ///
+
+    callback(sourceEntryPath, targetEntryPath);
+
+    return;
+  }
+
+  rename(absoluteSourceDirectoryPath, absoluteTargetDirectoryPath, (error) => {
+    if (error) {
+      targetEntryPath = sourceEntryPath;  ///
+    }
+
+    callback(sourceEntryPath, targetEntryPath);
+  });
+}