mirror of
https://github.com/coderaiser/cloudcmd.git
synced 2026-07-19 01:17:18 +00:00
minor changes
This commit is contained in:
parent
5f6f577d7e
commit
dd29c4a8d6
6 changed files with 43 additions and 25 deletions
|
|
@ -324,8 +324,10 @@
|
|||
|
||||
if(lResult)
|
||||
lResult = CloudServer.Minify.optimize(lName, {
|
||||
cache: true,
|
||||
callback: function(pFileData){
|
||||
name : lName,
|
||||
request : pReq,
|
||||
response : pRes,
|
||||
callback : function(pFileData){
|
||||
lReadFileFunc_f(undefined, pFileData, false);
|
||||
}
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1,18 +1,18 @@
|
|||
(function(){
|
||||
'use strict';
|
||||
|
||||
var main = require('./main'), //global.cloudcmd.main,
|
||||
DIR = main.DIR,
|
||||
var main = require('./main'), //global.cloudcmd.main,
|
||||
DIR = main.DIR,
|
||||
|
||||
fs = main.fs,
|
||||
path = main.path,
|
||||
Util = main.util,
|
||||
fs = main.fs,
|
||||
path = main.path,
|
||||
Util = main.util,
|
||||
|
||||
/* object contains hashes of files*/
|
||||
CHANGESNAME = DIR + 'json/changes',
|
||||
CHANGES_JSON = CHANGESNAME + '.json',
|
||||
|
||||
Times = main.require(CHANGESNAME) || [],
|
||||
CHANGESNAME = DIR + 'json/changes',
|
||||
CHANGES_JSON = CHANGESNAME + '.json',
|
||||
|
||||
Times = main.require(CHANGESNAME) || [],
|
||||
GTimesChanged;
|
||||
|
||||
exports.isFileChanged = function(pFileName, pLastFile_b, pCallBack){
|
||||
|
|
@ -29,6 +29,7 @@
|
|||
}
|
||||
}
|
||||
|
||||
console.log(pFileName);
|
||||
fs.stat(pFileName, function(pError, pStat){
|
||||
var lTimeChanged;
|
||||
|
||||
|
|
@ -42,7 +43,7 @@
|
|||
};
|
||||
|
||||
lTimeChanged =
|
||||
GTimesChanged = true;
|
||||
GTimesChanged = true;
|
||||
}
|
||||
|
||||
if(pLastFile_b && GTimesChanged)
|
||||
|
|
@ -70,8 +71,4 @@
|
|||
Util.log('minify: file ' + path.basename(pFileName) + ' writed...');
|
||||
});
|
||||
}
|
||||
|
||||
exports.isFileChanged(DIR + 'manifest.yml', true, function(pData){
|
||||
console.log(pData);
|
||||
});
|
||||
})();
|
||||
|
|
@ -7,7 +7,7 @@
|
|||
DIR = main.DIR,
|
||||
LIBDIR = main.LIBDIR,
|
||||
HTMLDIR = main.HTMLDIR,
|
||||
|
||||
Util = main.util,
|
||||
Minify = main.require('minify');
|
||||
|
||||
exports.Minify = {
|
||||
|
|
@ -53,7 +53,25 @@
|
|||
this.MinFolder = Minify.MinFolder;
|
||||
|
||||
if(this._allowed.css || this._allowed.js || this._allowed.html){
|
||||
Minify.optimize(pName, pParams);
|
||||
main.srvrequire("ischanged").isFileChanged(pName, false, function(pChanged){
|
||||
if(!pChanged){
|
||||
Minify.optimize(pName, pParams);
|
||||
}else{
|
||||
var lDot = pName.lastIndexOf('.'),
|
||||
lExt = pName.substr(lDot);
|
||||
|
||||
pName = Minify.MinFolder + main.crypto.createHash('sha1')
|
||||
.update(pName)
|
||||
.digest('hex') + lExt;
|
||||
|
||||
console.log(pName);
|
||||
|
||||
pParams.callback = null;
|
||||
if(pParams.request && pParams.response)
|
||||
main.sendFile(pParams);
|
||||
}
|
||||
});
|
||||
|
||||
lResult = true;
|
||||
}
|
||||
}
|
||||
|
|
@ -64,7 +82,7 @@
|
|||
html : false
|
||||
};
|
||||
|
||||
console.log('Could not minify ' +
|
||||
Util.log('Could not minify ' +
|
||||
'without minify module\n' +
|
||||
'npm i minify');
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue