From bfff1224e062234beda9b5d10f0d98adc0acd6c9 Mon Sep 17 00:00:00 2001 From: coderaiser Date: Fri, 4 Jul 2014 09:40:35 -0400 Subject: [PATCH] refactor(commander) readDir -> getAllStats --- lib/server/commander.js | 52 ++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 29 deletions(-) diff --git a/lib/server/commander.js b/lib/server/commander.js index 64a2eafc..a8b978aa 100644 --- a/lib/server/commander.js +++ b/lib/server/commander.js @@ -24,42 +24,36 @@ exports.getDirContent = function(path, callback) { Util.checkArgs(arguments, ['path', 'callback']); - fs.readdir(path, readDir.bind(null, { - callback : callback, - path : path - })); + fs.readdir(path, function(error, names) { + if (error) + callback(error); + else + getAllStats(path, names, callback); + }); }; /** - * Функция читает ссылку или выводит информацию об ошибке - * @param pError - * @param pFiles + * @param path + * @param names */ - function readDir(params, error, names) { - var length = names.length, - funcs = {}, - p = params, - dirPath = format.addSlashToEnd(p.path); + function getAllStats(path, names, callback) { + var length = names.length, + funcs = {}, + dir = format.addSlashToEnd(path); - if (error) { - p.callback(error); - } else { - - if (!length) - funcs.exec = Util.exec.ret; - else - names.forEach(function(name) { - var path = dirPath + name; - - funcs[name] = Util.exec.with(getStat, name, path); - }); - - Util.exec.parallel(funcs, function(error, files) { - fillJSON(dirPath, files || {}, p.callback); + if (!length) + funcs.exec = Util.exec.ret; + else + names.forEach(function(name) { + var path = dir + name; + + funcs[name] = Util.exec.with(getStat, name, path); }); - - } + + Util.exec.parallel(funcs, function(error, files) { + fillJSON(dir, files || {}, callback); + }); } function getStat(name, path, callback) {