From 40d3c596e142ebe22ec93c1deed90c6eb4cebca0 Mon Sep 17 00:00:00 2001 From: coderaiser Date: Wed, 19 Nov 2014 07:22:24 -0500 Subject: [PATCH] refactor(size) onReaddir: rm error --- lib/server/size.js | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/lib/server/size.js b/lib/server/size.js index bf2cd887..df3c3d3a 100644 --- a/lib/server/size.js +++ b/lib/server/size.js @@ -94,7 +94,12 @@ ++asyncRunning; fs.readdir(dir, function(error, files) { - onReaddir(error, files, dir); + if (error && stopOnError) { + wasError = true; + emitter.emit('error', error); + } else { + onReaddir(dir, files); + } }); } } @@ -103,15 +108,16 @@ } } - function onReaddir(error, files, dir) { - var n; + function onReaddir(dir, files) { + var n = files.length; asyncRunning--; - if (!error) { - n = files.length; - fileCounter += n; - + fileCounter += n; + + if (!n) + execCallBack(); + else files.forEach(function(file) { var dirPath = path.join(dir, file); @@ -119,10 +125,6 @@ getDirInfo(dirPath); }); }); - } - - if (!n) - execCallBack(); } }