change rm promise code, edits to make the synchronouse version use a loop rather than recursion

Author: lee-leonardo

lib/fileTools.js

@@ -11,7 +11,6 @@ var log = require('./log'),
     utils = require('./utils');
 
 var stat = Q.nfbind(fs.stat);
-var PromiseQueue = require('./promiseQueue');
 
 function readFile (source, options, callback) {
   return Q.nfcall(fs.readFile, source, options)
@@ -159,15 +158,11 @@ function searchFile (dir, fileName, callback) {
 // requires an absolute path for sourcePath and targetFolderPath.
 function flattenFolderStructureSync(sourcePath, targetFolderPath, callback) {
   return Q.resolve().then(function () {
-    var output = {
-      files: [],
-      folders: []
-    }
-    folderScanSync(output, sourcePath);
+    var output = folderScanSync(sourcePath);
 
     // move/copy files
     output.files.forEach(file => {
-      fs.renameSync(file, targetFolderPath +  path.parse(file).base, (err) => {
+      fs.renameSync(file, path.resolve(targetFolderPath, path.parse(file).base), (err) => {
         return callback(err);
       });
     });
@@ -183,68 +178,32 @@ function flattenFolderStructureSync(sourcePath, targetFolderPath, callback) {
   }).nodeify(callback);
 }
 
-// 1. Scan Folders, create an object
-function flattenFolderStructure(sourcePath, targetFolderPath, callback) {
-  return folderScan(sourcePath).then(output => {
-    return Q.all(output.files.map(file => { return fs.promises.rename(file, targetFolderPath + path.parse(file).base)}))
-      .then(() => {
-        return Q.all(output.folders.map(folder => {
-          return fs.promises.rmdir(folder)
-        }));
-    });
-  }).nodeify(callback);
-}
-
-// DFS crawl into the folder structure and grab all references.
-// output is an object: { files: [], folders: [] }
-function folderScanSync(output, directory) {
-  fs.readdirSync(directory)
-    .forEach(function (fileEntry) {
-      var fileEntryPath = path.join(directory, fileEntry);
-
-      if (fs.statSync(fileEntryPath).isDirectory()) {
-        folderScanSync(output, fileEntryPath + "/");
-        output.folders.push(fileEntryPath);
-      } else {
-        output.files.push(fileEntryPath);
-      }
-  });
-}
-
-// utilizes a simple promise queue to
-function folderScan(rootDirectory) {
-  return Q.Promise(function (scanResolve, scanReject) {
-    let queue =  new PromiseQueue();
-    const folders = [];
-    const files = [];
-
-    queue.enqueue(folderScanPromise(queue, rootDirectory, folders, files))
-      .then(() => {
-        scanResolve({
-          folders: folders.reverse(),
-          files: files.reverse()
-        });
-      });
-  });
-}
-
-function folderScanPromise(promiseQueue, directory, folders, files) {
-  // readdir promise
-  return fs.promises.readdir(directory).then(directoryEntries => {
-    // Q.all on the files in the directory
-    return Q.all(directoryEntries.map(entry => {
-      // grab the stats, if directory, then put it in the queue and add it to folders, if a file, add it to files
-      const filePath = path.join(directory, entry);
-      return fs.promises.stat().then(stats => {
-        if (stats.isDirectory()) {
-          folders.push(filePath);
-          promiseQueue.enqueue(folderScanPromise(promiseQueue, filePath, folders, files));
+// queues new entries into the unexplored paths, and iterates through it, execution stops when all reaches end.
+// output is an object: { files: [], folders: [] }, the order of the files and object is reversed of traversal order
+function folderScanSync(directory) {
+  const unexplored = [directory];
+  const folders = [];
+  const files = [];
+
+  for (let i = 0; i < unexplored.length; i++) {
+    const currentPath = unexplored[i];
+    fs.readdirSync(currentPath)
+      .forEach(function (fileEntry) {
+        var fileEntryPath = path.join(currentPath, fileEntry);
+
+        if (fs.statSync(fileEntryPath).isDirectory()) {
+          unexplored.push(fileEntryPath);
+          folders.push(fileEntryPath);
         } else {
-          files.push(filePath);
+          files.push(fileEntryPath);
         }
-      });
-    }));
-  });
+    });
+  }
+
+  return {
+    folders: folders.reverse(),
+    files: files.reverse()
+  };
 }
 
 // Copies the 'source' file to 'target' if it's missing after creating the
@@ -395,6 +354,6 @@ module.exports = {
   replaceFileContent: replaceFileContent,
   searchFile: searchFile,
   syncFiles: syncFiles,
-  flattenFolderStructure: flattenFolderStructure,
+  flattenFolderStructure: flattenFolderStructureSync,
   folderScanSync: folderScanSync
 };