added directoryExists and fileExists to fileHelpers

fixed bug with removeOldMergeFiles
z-edit · Aug 26, 2021 · bc3b33e · bc3b33e
1 parent bdb0bb8
commit bc3b33e
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/src/javascripts/Services/merge/mergeBuilder.js b/src/javascripts/Services/merge/mergeBuilder.js
@@ -65,7 +65,8 @@ ngapp.service('mergeBuilder', function($q, $rootScope, progressLogger, mergeServ
         merge.dataPath = mergeService.getMergeDataPath(merge);
         if (!merge.method) merge.method = DEFAULT_MERGE_METHOD;
         merge.failedToCopy = [];
-        removeOldMergeFiles(merge);
+        if (fh.directoryExists(merge.dataPath))
+            removeOldMergeFiles(merge);
         let mergeFolderPath = `${merge.dataPath}\\merge - ${merge.name}`;
         progressLogger.init('merge', mergeFolderPath);
         log(`\r\nBuilding merge ${merge.name}`);

diff --git a/src/javascripts/helpers/fileHelpers.js b/src/javascripts/helpers/fileHelpers.js
@@ -26,6 +26,22 @@ fh.path = jetpack.path;
 // log app directory for reference
 console.log('App directory: ' + fh.appPath);
 
+fh.directoryExists = function(path) {
+    try {
+        return jetpack.exists(path) === 'dir';
+    } catch (x) {
+        return false;
+    }
+};
+
+fh.fileExists = function(path) {
+    try {
+        return jetpack.exists(path) === 'file';
+    } catch (x) {
+        return false;
+    }
+};
+
 fh.loadJsonFile = function(filePath) {
     if (jetpack.exists(filePath) === 'file')
         return jetpack.read(filePath, 'json');