More complete pause coverage

npm · Nov 8, 2011 · 1b69092 · 1b69092
1 parent d07161d
commit 1b69092
Showing 1 changed file with 15 additions and 3 deletions.
diff --git a/lib/dir-reader.js b/lib/dir-reader.js
@@ -52,6 +52,7 @@ DirReader.prototype._read = function () {
   if (!me._entries) return me._getEntries()
 
   if (me._paused || me._currentEntry || me._aborted) {
+    // console.error("DR paused=%j, current=%j, aborted=%j", me._paused, !!me._currentEntry, me._aborted)
     return
   }
 
@@ -101,6 +102,10 @@ DirReader.prototype._read = function () {
     })
 
     entry.on("ready", function () {
+      if (me._paused) {
+        // console.error("pausing child entry")
+        entry.pause()
+      }
       me.emit("entry", entry)
       me.emit("child", entry)
     })
@@ -140,9 +145,16 @@ DirReader.prototype.pause = function () {
 
 DirReader.prototype.resume = function () {
   var me = this
+  if (!me._paused) return
   me._paused = false
-  if (me._currentEntry && me._currentEntry.resume) {
-    me._currentEntry.resume()
-  } else me._read()
   me.emit("resume")
+  if (me._paused) {
+    // console.error("DR Re-paused", me.path)
+    return
+  }
+  if (me._currentEntry) {
+    if (me._currentEntry.resume) {
+      me._currentEntry.resume()
+    }
+  } else me._read()
 }