Mirrors/cloudcmd
1
0
Fork 0
mirror of https://github.com/coderaiser/cloudcmd.git synced 2026-01-23 18:55:26 +00:00
Code Issues Projects Releases Wiki Activity

feature(main) mv readFiles -> files.read

Browse source
This commit is contained in:
coderaiser 2013-11-25 11:18:27 +00:00
parent e32a316366
commit 1ad1e7e14c
3 changed files with 74 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

3
cloudcmd.js
View file

@ -12,6 +12,7 @@
path = main.path,
fs = main.fs,
files = main.files,
CloudFunc = main.cloudfunc,
AppCache = main.appcache,
Util = main.util,
@ -144,7 +145,7 @@
if (Config.ssl)
lFiles.push(KEY, CERT);
main.readFiles(lFiles, function(pErrors, pFiles) {
files.read(lFiles, function(pErrors, pFiles) {
if (pErrors)
Util.log(pErrors);
else {

70
lib/server/files.js Normal file
View file

@ -0,0 +1,70 @@
(function(object) {
'use strict';
if(!global.cloudcmd)
return console.log(
'# dir.js' + '\n' +
'# -----------' + '\n' +
'# Module is part of Cloud Commander,' + '\n' +
'# used for getting file change time.' + '\n' +
'# http://cloudcmd.io' + '\n');
var main = global.cloudcmd.main,
fs = main.fs,
path = main.path,
CloudFunc = main.cloudfunc,
Util = main.util;
object.read = function(pFiles, pCallBack) {
var lDone = [],
lFiles,
lErrors,
i, n,
lName,
lReadedFiles = {},
lDoneFunc = function (pParams) {
var msg, status, p, lName,
lRet = Util.checkObj(pParams, ['error', 'data', 'params']);
if (lRet) {
lDone.pop();
p = pParams,
lName = p.params;
if (p.error) {
status = 'error';
if (!lErrors)
lErrors = {};
lErrors[lName] = p.error;
}
else {
status = 'ok';
lReadedFiles[lName] = p.data;
}
lName = path.basename(lName);
msg = CloudFunc.formatMsg('read', lName, status);
Util.log(msg);
if (!lDone.length)
Util.exec(pCallBack, lErrors, lReadedFiles);
}
};
if (Util.isArray(pFiles))
lFiles = pFiles;
else
lFiles = [pFiles];
for(i = 0, n = lFiles.length; i < n; i++) {
lName = lFiles.pop();
lDone.push(lName);
fs.readFile(lName, Util.call(lDoneFunc, lName));
}
};
})(this);

51
lib/server/main.js
View file

@ -67,7 +67,6 @@
exports.sendResponse = sendResponse,
exports.sendError = sendError,
exports.redirect = redirect,
exports.readFiles = readFiles,
exports.checkParams = checkParams,
exports.checkCallBackParams = checkCallBackParams,
@ -116,6 +115,8 @@
exports.update = srvrequire('update'),
exports.ischanged = srvrequire('ischanged');
exports.commander = srvrequire('commander');
exports.files = srvrequire('files');
exports.minify = srvrequire('minify').Minify;
/* second initializing after all modules load, so global var is *
@ -387,54 +388,6 @@
return Util.checkObj(pParams, ['error', 'data', 'params']);
}
function readFiles(pFiles, pCallBack) {
var lDone = [],
lFiles,
lErrors,
lReadedFiles = {},
lDoneFunc = function (pParams) {
var msg, status,
lRet = Util.checkObj(pParams, ['error', 'data', 'params']);
if (lRet) {
lDone.pop();
var p = pParams,
lName = p.params;
if (p.error) {
status = 'error';
if (!lErrors) lErrors = {};
lErrors[lName] = p.error;
}
else{
status = 'ok';
lReadedFiles[lName] = p.data;
}
lName = path.basename(lName);
msg = CloudFunc.formatMsg('read', lName, status);
Util.log(msg);
if ( !lDone.length )
Util.exec(pCallBack, lErrors, lReadedFiles);
}
};
if ( Util.isArray(pFiles) )
lFiles = pFiles;
else
lFiles = [pFiles];
for(var i = 0, n = lFiles.length; i < n; i++) {
var lName = lFiles.pop();
lDone.push(lName);
fs.readFile(lName, Util.call( lDoneFunc, lName ));
}
}
function checkParams(pParams, pAdditional) {
var lRet = Util.checkObjTrue( pParams, ['name', REQUEST, RESPONSE] );