inga-lovinde
/
micro-build-server
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Status page refactored

Browse Source
dependabot/npm_and_yarn/BuildServer/eslint-7.2.0
Inga 🏳‍🌈 9 years ago
parent 9cd602d8fc
commit 5cc1338744
2 changed files with 112 additions and 89 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 101
      BuildServer/lib/status-processor.js
  2. 100
      BuildServer/routes/status.js

101
BuildServer/lib/status-processor.js
Unescape View File

@ -0,0 +1,101 @@
"use strict";
var fs = require('fs'),
url = require('url'),
glob = require('glob');
var addBranchInfo = function (app, options, callback) {
var branchFile = app.get('releasepath') + "/" + options.owner + "/" + options.reponame + "/$revs/" + options.rev + ".branch";
fs.exists(branchFile, function (exists) {
if (!exists) {
return callback("BranchFileNotFound", options);
}
fs.readFile(branchFile, function (err, data) {
if (err) {
return callback(err, result);
}
options.branch = data.toString();
options.branchName = options.branch.split("/").pop();
return callback(null, options);
});
});
};
var addRevInfo = function (app, options, callback) {
var revFile = app.get('releasepath') + "/" + options.owner + "/" + options.reponame + "/" + options.branch + "/latest.id";
fs.exists(revFile, function (exists) {
if (!exists) {
return callback("RevFileNotFound", options);
}
fs.readFile(revFile, function (err, data) {
if (err) {
return callback(err, options);
}
options.rev = data.toString();
return callback(null, options);
});
});
};
var parseOptions = function (app, options, callback) {
var result = {};
result.owner = options.owner;
result.reponame = options.reponame;
if (options.rev && !/^[\da-f]{40}$/i.test(options.rev)) {
return callback("Wrong rev format: " + options.rev, options);
}
if (options.rev) {
result.rev = options.rev;
return addBranchInfo(app, result, callback);
} else if (/^[\da-f]{40}$/i.test(options.branchName)) {
result.rev = options.branchName;
return addBranchInfo(app, result, callback);
} else {
result.branchName = options.branchName || "master";
result.branch = "refs/heads/" + result.branchName;
return addRevInfo(app, result, callback);
}
};
var loadReport = function (app, options, callback) {
var releaseDir = app.get('releasepath') + "/" + options.owner + "/" + options.reponame + "/" + options.branch + "/" + options.rev;
glob("**", {cwd: releaseDir, mark: true}, function (err, files) {
if (err) {
return callback(err, options);
}
var reportFile = releaseDir + "/report.json";
options.files = files;
fs.exists(reportFile, function (exists) {
if (!exists) {
return callback("ReportFileNotFound", options);
}
fs.readFile(reportFile, function (err, dataBuffer) {
if (err) {
return callback(err, options);
}
var data = dataBuffer.toString();
if (!data) {
return callback("ReportFileNotFound", options);
}
options.report = JSON.parse(data);
return callback(null, options);
});
});
});
};
exports.getReport = function (app, options, callback) {
parseOptions(app, options, function (err, result) {
if (err) {
return callback(err);
}
return loadReport(app, result, callback);
});
}

100
BuildServer/routes/status.js
Unescape View File

@ -2,40 +2,8 @@
var fs = require('fs'), var fs = require('fs'),
url = require('url'), url = require('url'),
glob = require('glob'); glob = require('glob'),
statusProcessor = require('../lib/status-processor');
var addBranchInfo = function (app, options, callback) {
var branchFile = app.get('releasepath') + "/" + options.owner + "/" + options.reponame + "/$revs/" + options.rev + ".branch";
fs.exists(branchFile, function (exists) {
if (!exists) {
return callback("BranchFileNotFound", options);
}
fs.readFile(branchFile, function (err, data) {
if (err) {
return callback(err, result);
}
options.branch = data.toString();
options.branchName = options.branch.split("/").pop();
return callback(null, options);
});
});
};
var addRevInfo = function (app, options, callback) {
var revFile = app.get('releasepath') + "/" + options.owner + "/" + options.reponame + "/" + options.branch + "/latest.id";
fs.exists(revFile, function (exists) {
if (!exists) {
return callback("RevFileNotFound", options);
}
fs.readFile(revFile, function (err, data) {
if (err) {
return callback(err, options);
}
options.rev = data.toString();
return callback(null, options);
});
});
};
var parseOptionsFromReferer = function (req, callback) { var parseOptionsFromReferer = function (req, callback) {
var pathParts = (url.parse(req.headers.referer || "").pathname || "").split("/"); var pathParts = (url.parse(req.headers.referer || "").pathname || "").split("/");
@ -46,44 +14,9 @@ var parseOptionsFromReferer = function (req, callback) {
result.owner = pathParts[1]; result.owner = pathParts[1];
result.reponame = pathParts[2]; result.reponame = pathParts[2];
if (pathParts[3] && /^[\da-f]{40}$/i.test(pathParts[4])) { result.branchName = pathParts[3];
result.rev = pathParts[4]; result.rev = pathParts[4];
return addBranchInfo(req.app, result, callback); return callback(null, result);
} else {
result.branchName = pathParts[4] || "master";
result.branch = "refs/heads/" + result.branchName;
return addRevInfo(req.app, result, callback);
}
};
var loadReport = function (app, options, callback) {
var releaseDir = app.get('releasepath') + "/" + options.owner + "/" + options.reponame + "/" + options.branch + "/" + options.rev;
glob("**", {cwd: releaseDir, mark: true}, function (err, files) {
if (err) {
return callback(err, options);
}
var reportFile = releaseDir + "/report.json";
options.files = files;
fs.exists(reportFile, function (exists) {
if (!exists) {
return callback("ReportFileNotFound", options);
}
fs.readFile(reportFile, function (err, dataBuffer) {
if (err) {
return callback(err, options);
}
var data = dataBuffer.toString();
if (!data) {
return callback("ReportFileNotFound", options);
}
options.report = JSON.parse(data);
return callback(null, options);
});
});
});
}; };
exports.image = function(req, res) { exports.image = function(req, res) {
@ -117,14 +50,13 @@ exports.image = function(req, res) {
return handle(err, options); return handle(err, options);
} }
loadReport(req.app, options, function (err, options) { statusProcessor.getReport(req.app, options, function (err, options) {
handle(err, options); handle(err, options);
}); });
}); });
}; };
exports.page = function(req, res) { exports.page = function(req, res) {
// console.log(req);
var options = { var options = {
owner: req.params.owner, owner: req.params.owner,
reponame: req.params.reponame, reponame: req.params.reponame,
@ -132,20 +64,10 @@ exports.page = function(req, res) {
branch: "/refs/heads/" + req.params.branch, branch: "/refs/heads/" + req.params.branch,
rev: req.params.rev rev: req.params.rev
}; };
var finish = function (err, options) {
loadReport(req.app, options, function (err, options) {
options.err = err;
console.log(options);
res.render('status', options);
});
};
if (/^[\da-f]{40}$/i.test(options.branchName)) { statusProcessor.getReport(req.app, options, function (err, options) {
options.rev = options.branchName; options = options || {};
options.branchName = undefined; options.err = err;
options.branch = undefined; res.render('status', options);
return addBranchInfo(req.app, options, finish); });
} else {
return finish(undefined, options);
}
}; };

Write Preview
Loading…
Cancel
Save