diff --git a/lib/server/commander.js b/lib/server/commander.js index 44ec8a85..51d2b634 100644 --- a/lib/server/commander.js +++ b/lib/server/commander.js @@ -87,16 +87,17 @@ if(lRet){ var p = pParams, c = p.params, + lFiles = p.data, lDirPath = getDirPath(c.request); if(!p.error && p.data){ - p.data = p.data.sort(); + lFiles.data = lFiles.sort(); /* Получаем информацию о файлах */ - var n = p.data.length, + var n = lFiles.length, lStats = {}, lFilesData = { - files : p.data, + files : lFiles, stats : lStats, request : c.request, response : c.response @@ -108,11 +109,11 @@ if(n){ for(var i = 0; i < n; i++){ - var lName = lDirPath + p.data[i], + var lName = lDirPath + lFiles[i], lParams = { callback : lFill, count : n, - name : p.data[i], + name : lFiles[i], stats : lStats, }; @@ -256,11 +257,9 @@ * @param pName - полное имя файла */ function readFile(pParams){ - var lRet = Util.checkObj(pParams, - ['error', 'data', 'params']) && - - Util.checkObjTrue(pParams.params, - [REQUEST, RESPONSE, 'list']); + var lRet = checkParams(pParams) && + Util.checkObjTrue(pParams.params, + [REQUEST, RESPONSE, 'list']); if(lRet){ var p = pParams, @@ -344,12 +343,10 @@ * @pName */ function gzipData(pParams){ - var lRet = Util.checkObj(pParams, - ['error', 'data', 'params']); + var lRet = checkParams(pParams); if(lRet) - lRet = Util.checkObj(pParams.params, - ['callback']); + lRet = Util.checkObj(pParams.params, ['callback']); if(lRet){ var p = pParams, @@ -368,6 +365,10 @@ } + function checkParams(pParams){ + return Util.checkObj(pParams, ['error', 'data', 'params']); + } + function getPath(pReq){ var lParsedUrl = url.parse(pReq.url), lPath = lParsedUrl.pathname;