Skip to content

Wait for copy and remove promises to finish #1730

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
implausible merged 1 commit into from
Dec 11, 2019
Merged

Wait for copy and remove promises to finish #1730

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 25 additions & 19 deletions generate/scripts/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,29 +120,35 @@ var util = {
},

syncDirs: function(fromDir, toDir) {
let toFilePaths;
let fromFilePaths;
return Promise.all([
util.getFilePathsRelativeToDir(toDir),
util.getFilePathsRelativeToDir(fromDir)
]).then(function(filePaths) {
const toFilePaths = filePaths[0];
const fromFilePaths = filePaths[1];

// Delete files that aren't in fromDir
toFilePaths.forEach(function(filePath) {
if (!util.isFile(path.join(fromDir, filePath))) {
fse.remove(path.join(toDir, filePath));
}
])
.then(function(filePaths) {
toFilePaths = filePaths[0];
fromFilePaths = filePaths[1];

// Delete files that aren't in fromDir
return Promise.all(toFilePaths.map(function(filePath) {
if (!util.isFile(path.join(fromDir, filePath))) {
return fse.remove(path.join(toDir, filePath));
}
return Promise.resolve();
}));
})
.then(function() {
// Copy files that don't exist in toDir or have different contents
return Promise.all(fromFilePaths.map(function(filePath) {
const toFilePath = path.join(toDir, filePath);
const fromFilePath = path.join(fromDir, filePath);
if (!util.isFile(toFilePath) || util.readFile(toFilePath) !== util.readFile(fromFilePath)) {
return fse.copy(fromFilePath, toFilePath);
}
return Promise.resolve();
}));
});

// Copy files that don't exist in toDir or have different contents
fromFilePaths.forEach(function(filePath) {
const toFilePath = path.join(toDir, filePath);
const fromFilePath = path.join(fromDir, filePath);
if (!util.isFile(toFilePath) || util.readFile(toFilePath) !== util.readFile(fromFilePath)) {
fse.copy(fromFilePath, toFilePath);
}
});
});
}
};

Expand Down