suzanne.soy/shields
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge host and path into one match

Browse Source
This commit is contained in:
TBS 2014-07-13 14:00:44 +00:00
parent 11643dbf7e
commit 0fbc191679
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
server.js
View File

@ -1268,21 +1268,20 @@ cache(function(data, match, sendBadge) {
})); }));
// Jenkins build status integration // Jenkins build status integration
camp.route(/^\/jenkins(-ci)?\/s\/(http(s)?)\/([^\/]+)(\/.+?)?\/([^\/]+)\.(svg|png|gif|jpg)$/, camp.route(/^\/jenkins(-ci)?\/s\/(http(s)?)\/((?:[^\/]+)(?:\/.+?)?)\/([^\/]+)\.(svg|png|gif|jpg)$/,
cache(function(data, match, sendBadge) { cache(function(data, match, sendBadge) {
var scheme = match[2]; var scheme = match[2];
var host = match[4]; var host = match[4];
var path = match[5]; var job = match[5];
var job = match[6]; var format = match[6];
var format = match[7];
var options = { var options = {
json: true, json: true,
uri: scheme + '://' + host + '/' + (path || '') + '/job/' + job + '/api/json?tree=color' uri: scheme + '://' + host + '/job/' + job + '/api/json?tree=color'
}; };
var badgeData = getBadgeData('build', data); var badgeData = getBadgeData('build', data);
request(options, function(err, res, json) { request(options, function(err, res, json) {
if (err != null) { if (err !== null) {
badgeData.text[1] = 'inaccessible'; badgeData.text[1] = 'inaccessible';
sendBadge(format, badgeData); sendBadge(format, badgeData);
return; return;
@ -1308,16 +1307,15 @@ cache(function(data, match, sendBadge) {
}); });
})); }));
// Jenkins tests integration // Jenkins tests integration
camp.route(/^\/jenkins(-ci)?\/t\/(http(s)?)\/([^\/]+)(\/.+?)?\/([^\/]+)\.(svg|png|gif|jpg)$/, camp.route(/^\/jenkins(-ci)?\/t\/(http(s)?)\/((?:[^\/]+)(?:\/.+?)?)\/([^\/]+)\.(svg|png|gif|jpg)$/,
cache(function(data, match, sendBadge) { cache(function(data, match, sendBadge) {
var scheme = match[2]; var scheme = match[2];
var host = match[4]; var host = match[4];
var path = match[5]; var job = match[5];
var job = match[6]; var format = match[6];
var format = match[7];
var options = { var options = {
json: true, json: true,
uri: scheme + '://' + host + '/' + (path || '') + '/job/' + job + '/lastBuild/api/json?tree=actions[failCount,skipCount,totalCount]' uri: scheme + '://' + host + '/job/' + job + '/lastBuild/api/json?tree=actions[failCount,skipCount,totalCount]'
}; };
var badgeData = getBadgeData('tests', data); var badgeData = getBadgeData('tests', data);