Fixes shama#214 - Gaze.prototype._addToWatched repeating readDir of s…

…ame directory on each call
chebum · Jun 28, 2016 · aac0c51 · aac0c51
1 parent bec9df3
commit aac0c51
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 13 deletions.
diff --git a/lib/gaze.js b/lib/gaze.js
@@ -257,26 +257,27 @@ Gaze.prototype._addToWatched = function (files) {
   for (var i = 0; i < files.length; i++) {
     var file = files[i];
     var filepath = path.resolve(this.options.cwd, file);
+    var isDir = helper.isDir(file);
 
-    var dirname = (helper.isDir(file)) ? filepath : path.dirname(filepath);
+    var dirname = isDir ? filepath : path.dirname(filepath);
     dirname = helper.markDir(dirname);
 
     // If a new dir is added
-    if (helper.isDir(file) && !(filepath in this._watched)) {
-      helper.objectPush(this._watched, filepath, []);
+    if (!(dirname in this._watched)) {
+        helper.objectPush(this._watched, dirname, []);
+
+        // add folders into the mix
+        var readdir = fs.readdirSync(dirname);
+        for (var j = 0; j < readdir.length; j++) {
+          var dirfile = path.join(dirname, readdir[j]);
+          if (fs.lstatSync(dirfile).isDirectory()) {
+            helper.objectPush(this._watched, dirname, dirfile + path.sep);
+          }
+        }
     }
 
     if (file.slice(-1) === '/') { filepath += path.sep; }
     helper.objectPush(this._watched, path.dirname(filepath) + path.sep, filepath);
-
-    // add folders into the mix
-    var readdir = fs.readdirSync(dirname);
-    for (var j = 0; j < readdir.length; j++) {
-      var dirfile = path.join(dirname, readdir[j]);
-      if (fs.lstatSync(dirfile).isDirectory()) {
-        helper.objectPush(this._watched, dirname, dirfile + path.sep);
-      }
-    }
   }
   return this;
 };

diff --git a/test/add_test.js b/test/add_test.js
@@ -14,7 +14,13 @@ exports.add = {
     done();
   },
   addToWatched: function (test) {
-    test.expect(1);
+    test.expect(2);
+    var oldreaddirSync = fs.readdirSync;
+    var readdirCount = 0;
+    fs.readdirSync = function() {
+      readdirCount++;
+      return oldreaddirSync.apply(this, arguments);
+    };
     var files = [
       'Project (LO)/',
       'Project (LO)/one.js',
@@ -31,10 +37,14 @@ exports.add = {
       'nested/': ['sub/', 'sub2/', 'one.js', 'three.js'],
       'nested/sub/': ['two.js'],
     };
+
     var gaze = new Gaze('addnothingtowatch');
     gaze._addToWatched(files);
     var result = gaze.relative(null, true);
     test.deepEqual(sortobj(result), sortobj(expected));
+    test.strictEqual(readdirCount, 4);
+
+    fs.readdirSync = oldreaddirSync;
     gaze.on('end', test.done);
     gaze.close();
   },