fix watching

sokra · sokra · commit e8f0e1d7cf2d · 2013-02-01T08:03:38.000+01:00
diff --git a/lib/Cache.js b/lib/Cache.js
diff --git a/lib/Compiler.js b/lib/Compiler.js
@@ -5,8 +5,6 @@
 var clone = require("clone");
 var Tapable = require("tapable");
 
-var Cache = require("./Cache");
-
 var Compilation = require("./Compilation");
 var Parser = require("./Parser");
 var Resolver = require("enhanced-resolve/lib/Resolver");
diff --git a/lib/ContextModule.js b/lib/ContextModule.js
@@ -51,7 +51,7 @@ ContextModule.prototype.readableIdentifier = function(requestShortener) {
 ContextModule.prototype.needRebuild = function(fileTimestamps, contextTimestamps) {
 	var ts = contextTimestamps[this.context];
 	if(!ts) return true;
-	return ts > this.builtTime;
+	return ts >= this.builtTime;
 };
 
 ContextModule.prototype.disconnect = function disconnect() {
diff --git a/lib/NormalModule.js b/lib/NormalModule.js
@@ -125,7 +125,7 @@ NormalModule.prototype.needRebuild = function needRebuild(fileTimestamps, contex
 		if(!ts) timestamp = Infinity;
 		if(ts > timestamp) timestamp = ts;
 	});
-	return timestamp > this.buildTimestamp;
+	return timestamp >= this.buildTimestamp;
 };
 
 NormalModule.prototype.size = function() {
diff --git a/lib/node/NodeWatchFileSystem.js b/lib/node/NodeWatchFileSystem.js
@@ -92,6 +92,8 @@ module.exports = NodeWatchFileSystem;
  * @param callbackUndelayed {function()} called once after first change
  */
 NodeWatchFileSystem.prototype.watch = function(files, dirs, startTime, delay, callback, callbackUndelayed) {
+	var inputFileSystem = this.inputFileSystem;
+
 	if(!callbackUndelayed) callbackUndelayed = function() {}
 	var closed = false;
 	var fileTimestamps = {};
@@ -133,7 +135,7 @@ NodeWatchFileSystem.prototype.watch = function(files, dirs, startTime, delay, ca
 			fs.stat(item.path, function(err, stat) {
 				var ts = err ? Infinity : stat.mtime.getTime();
 				fileTimestamps[item.path] = ts;
-				if(ts > startTime) {
+				if(ts >= startTime) {
 					item.dirty = true;
 					change();
 				}
@@ -149,7 +151,7 @@ NodeWatchFileSystem.prototype.watch = function(files, dirs, startTime, delay, ca
 				}
 				traverse(item.path, files, function(ts) {
 					if(item.type == 2) dirTimestamps[item.path] = ts;
-					if(ts > startTime) {
+					if(ts >= startTime) {
 						item.dirty = true;
 						change();
 					}
@@ -184,7 +186,7 @@ NodeWatchFileSystem.prototype.watch = function(files, dirs, startTime, delay, ca
 								// file
 								var ts = stat.mtime.getTime();
 								fileTimestamps[childItem.path] = ts;
-								if(ts > startTime) {
+								if(ts >= startTime) {
 									childItem.dirty = true;
 								}
 								return callback(null, ts);
@@ -198,7 +200,7 @@ NodeWatchFileSystem.prototype.watch = function(files, dirs, startTime, delay, ca
 									}
 									traverse(thisPath, files, function(ts) {
 										dirTimestamps[childItem.path] = ts;
-										if(ts > startTime) {
+										if(ts >= startTime) {
 											childItem.dirty = true;
 										}
 										return callback(null, ts);
@@ -277,6 +279,7 @@ NodeWatchFileSystem.prototype.watch = function(files, dirs, startTime, delay, ca
 	// 7.
 	function onTimeout() {
 		if(closed) return;
+		if(inputFileSystem && inputFileSystem.purge) inputFileSystem.purge();
 		callback(null, [], [], fileTimestamps, dirTimestamps);
 		
 		close();
@@ -289,27 +292,8 @@ NodeWatchFileSystem.prototype.watch = function(files, dirs, startTime, delay, ca
 		});	
 	}
 	
-	return;
-
-	setTimeout(function() {
-		var fileTs = {};
-		async.forEach(files, function(file, callback) {
-			fs.stat(file, function(err, stat) {
-				var ts = err ? Infinity : stat.mtime;
-				fileTs[file] = ts;
-				callback();
-			});
-		}, function(err) {
-			if(closed) return;
-			if(err) return callback(err);
-			if(this.inputFileSystem.purge) this.inputFileSystem.purge();
-			return callback(null, [], fileTs, {});
-		}.bind(this));
-	}.bind(this), 1000);
 	return {
-		close: function() {
-			closed = true;
-		}
+		close: close
 	}
 };
 
