Skip to content
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

Jump to bottom

Fix polling on Windows with multiple "add" events + support of "delete" #124

Closed
wants to merge 9 commits into from
Closed

Fix polling on Windows with multiple "add" events + support of "delete" #124

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8970b4a
Support file removal and directory removal with polling
tym-network May 23, 2014
6afeab3
Fixed issue with multiple events fired on Windows
tym-network May 23, 2014
9aecea2
Use remove to throw unlink events
tym-network May 23, 2014
1675e3c
Improved check on file changed/delete
tym-network May 23, 2014
f273562
Add newline at end
tym-network May 23, 2014
9b890c7
Add tests to avoid errors when not using polling
tym-network May 23, 2014
ffeaddc
Use asynchronous exists
tym-network May 26, 2014
3c27ea9
Merge branch 'master' of https://github.com/paulmillr/chokidar
tym-network Aug 19, 2014
32f6d10
Merge branch 'master' of https://github.com/paulmillr/chokidar
tym-network Aug 20, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
25 changes: 21 additions & 4 deletions index.js 100644 → 100755
View file
Open in desktop
Expand Up @@ -238,7 +238,7 @@ FSWatcher.prototype._watch = function(item, callback) {
options.interval = this.enableBinaryInterval && isBinaryPath(basename) ?
this.options.binaryInterval : this.options.interval;
fs.watchFile(item, options, function(curr, prev) {
if (curr.mtime.getTime() > prev.mtime.getTime()) {
if (curr.mtime.getTime() > prev.mtime.getTime() || curr.mtime.getTime() === 0) {
callback(item, curr);
}
});
Expand Down Expand Up @@ -278,7 +278,19 @@ FSWatcher.prototype._handleFile = function(file, stats, initialAdd) {
var _this = this;
if (initialAdd == null) initialAdd = false;
this._watch(file, function(file, newStats) {
return _this.emit('change', file, newStats);
if (newStats && newStats.mtime.getTime() === 0) {
fs.exists(file, function(exists) {
// Fix issues where mtime is null but file is still present
if (!exists) {
_this._remove(sysPath.dirname(file), sysPath.basename(file));
return;
} else {
return _this.emit('change', file, newStats);
}
});
} else {
return _this.emit('change', file, newStats);
}
});
if (!(initialAdd && this.options.ignoreInitial)) {
return this.emit('add', file, stats);
Expand All @@ -297,7 +309,8 @@ FSWatcher.prototype._handleDir = function(directory, stats, initialAdd) {
return fs.readdir(directory, function(error, current) {
if (error != null) return _this._emitError(error);
if (!current) return;

// Normalize the direcotry name on Windows
directory = sysPath.join(directory, '');
var previous = _this._getWatchedDir(directory);

// Files that absent in current directory snapshot
Expand All @@ -320,7 +333,11 @@ FSWatcher.prototype._handleDir = function(directory, stats, initialAdd) {
});
};
read(directory, initialAdd);
this._watch(directory, function(dir) {
this._watch(directory, function(dir, stats) {
// Current directory is removed, do nothing
if (stats && stats.mtime.getTime() === 0) {
return;
}
return read(dir, false);
});
if (!(initialAdd && this.options.ignoreInitial)) {
Expand Down