Skip to content

Fix multiple calls to callback when overwriting files #77

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

Open
jfremy wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fix multiple calls to callback when overwriting files #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
70d2bc1
Fix multiple calls to callback when overwriting files
Jan 16, 2015
1f187ac
Merge remote-tracking branch 'project/master' into fix_cb_on_overwrite
Oct 2, 2015
6c795b1
bump modules version
Oct 26, 2015
42194e7
Adapt test to newer read-dir-files module
Oct 26, 2015
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
11 changes: 10 additions & 1 deletion lib/ncp.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ function ncp (source, dest, options, callback) {
copyFile(file, target);
});
}
if (modified) {
else if (modified) {
var stat = dereference ? fs.stat : fs.lstat;
stat(target, function(err, stats) {
//if souce modified time greater to target modified time copy file
Expand Down Expand Up @@ -250,6 +250,15 @@ function ncp (source, dest, options, callback) {
function cb(skipped) {
if (!skipped) running--;
finished++;
if(running < 0 || finished > started) {
Copy link
Copy Markdown

@stefanpenner stefanpenner Jan 27, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good idea, this will help catch other mis-matches

if(cback !== undefined) {
var err = new Error("Invalid state", "INVALID_STATE");
err.running = running;
err.finished = finished;
err.started = started;
return cback(err);
}
}
if ((started === finished) && (running === 0)) {
if (cback !== undefined ) {
return errs ? cback(errs) : cback(null);
Expand Down
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
"ncp": "./bin/ncp"
},
"devDependencies": {
"mocha": "1.15.x",
"rimraf": "1.0.x",
"read-dir-files": "0.0.x"
"mocha": "2.3.x",
"rimraf": "2.4.x",
"read-dir-files": "0.1.x"
},
"main": "./lib/ncp.js",
"repository": {
Expand Down
36 changes: 30 additions & 6 deletions test/ncp.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ describe('ncp', function () {

describe('when copying a directory of files', function () {
it('files are copied correctly', function (cb) {
readDirFiles(src, 'utf8', function (srcErr, srcFiles) {
readDirFiles(out, 'utf8', function (outErr, outFiles) {
readDirFiles.read(src, 'utf8', function (srcErr, srcFiles) {
readDirFiles.read(out, 'utf8', function (outErr, outFiles) {
assert.ifError(srcErr);
assert.deepEqual(srcFiles, outFiles);
cb();
Expand All @@ -45,7 +45,7 @@ describe('ncp', function () {
});

it('files are copied correctly', function (cb) {
readDirFiles(src, 'utf8', function (srcErr, srcFiles) {
readDirFiles.read(src, 'utf8', function (srcErr, srcFiles) {
function filter(files) {
for (var fileName in files) {
var curFile = files[fileName];
Expand All @@ -56,7 +56,7 @@ describe('ncp', function () {
}
}
filter(srcFiles);
readDirFiles(out, 'utf8', function (outErr, outFiles) {
readDirFiles.read(out, 'utf8', function (outErr, outFiles) {
assert.ifError(outErr);
assert.deepEqual(srcFiles, outFiles);
cb();
Expand Down Expand Up @@ -98,8 +98,8 @@ describe('ncp', function () {
}, function(err) {
if(err) return cb(err);

readDirFiles(src, 'utf8', function (srcErr, srcFiles) {
readDirFiles(out, 'utf8', function (outErr, outFiles) {
readDirFiles.read(src, 'utf8', function (srcErr, srcFiles) {
readDirFiles.read(out, 'utf8', function (outErr, outFiles) {
assert.ifError(srcErr);
assert.deepEqual(srcFiles.a, outFiles.z);
cb();
Expand All @@ -110,6 +110,30 @@ describe('ncp', function () {
});
});

describe('callbacks sanity checks', function() {
"use strict";
describe('regular files and directories', function () {
var fixtures = path.join(__dirname, 'regular-fixtures'),
src = path.join(fixtures, 'src'),
out = path.join(fixtures, 'out');

before(function (cb) {
rimraf(out, function () {
ncp(src, out, cb);
});
});

describe('when overwriting files', function () {
it('should call the callback only once', function (cb) {
ncp(path.join(src,"c"), path.join(out, "c"), {}, function (err) {
cb(err);
});
});
});

});
});

describe('symlink handling', function () {
var fixtures = path.join(__dirname, 'symlink-fixtures'),
src = path.join(fixtures, 'src'),
Expand Down