break out analyze sites

This commit is contained in:
soulgalore 2014-07-30 21:30:33 +02:00
parent f347240728
commit 1a9b128e27
1 changed files with 37 additions and 34 deletions

View File

@ -59,45 +59,48 @@ Runner.prototype.run = function(finshedCb) {
logVersions(callback);
}
],
function(err, results){
if (err) throw err;
if (config.sites) {
self.sites = {};
var urls = fs.readFileSync(config.sites).toString().split(EOL);
var queue = async.queue(self._setupSite, 1);
log.log('info', 'Analyze ' + urls.length + ' sites');
urls.forEach(function (url) {
if (url!=="") queue.push({
'url': url,
'runner': self
}, function() {
log.log('info', "Finished with site " + url);
});
});
queue.drain = function() {
async.parallel({
copySiteAssets: function(cb) {
self.htmlRenderer.copyAssets(path.join(config.run.absResultDir,'..'), cb);
},
renderSites: function(cb) {
self.htmlRenderer.renderSites(self.sites, cb);
}
},
function(err, results) {
if (!err)
log.log('info', "Wrote sites result to " + config.run.absResultDir);
finshedCb();
});
};
}
if (config.sites)
self._analyzeSites(finshedCb);
else
self._fetchData(finshedCb);
self._analyzeSite(finshedCb);
});
};
Runner.prototype._analyzeSites = function(cb) {
var self = this;
self.sites = {};
var urls = fs.readFileSync(config.sites).toString().split(EOL);
var queue = async.queue(self._setupSite, 1);
log.log('info', 'Analyze ' + urls.length + ' sites');
urls.forEach(function(url) {
if (url !== "") queue.push({
'url': url,
'runner': self
}, function() {
log.log('info', "Finished with site " + url);
});
});
queue.drain = function() {
async.parallel({
copySiteAssets: function(cb) {
self.htmlRenderer.copyAssets(path.join(config.run.absResultDir, '..'), cb);
},
renderSites: function(cb) {
self.htmlRenderer.renderSites(self.sites, cb);
}
},
function(err, results) {
if (!err)
log.log('info', "Wrote sites result to " + config.run.absResultDir);
cb();
});
};
};
Runner.prototype._setupSite = function(args, cb) {
var url = args.url;
config.url= url;
@ -110,12 +113,12 @@ Runner.prototype._setupSite = function(args, cb) {
log.log('error', "Couldn't create the data dir:" + dataDir + ' ' + err);
throw err;
}
else args.runner._fetchData(cb);
else args.runner._analyzeSite(cb);
});
};
Runner.prototype._fetchData = function(cb) {
Runner.prototype._analyzeSite = function(cb) {
var self = this;
/**