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

Tidy badly formatted JSON

Browse Source
This commit is contained in:
Greg Bowler 2015-01-07 16:03:31 +00:00
parent 79f7c97327
commit 4a6104d89a
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
server.js
View File

@ -2783,24 +2783,36 @@ cache(function(data, match, sendBadge, request) {
// CircleCI build integration. // CircleCI build integration.
// https://circleci.com/api/v1/project/BrightFlair/PHP.Gt?circle-token=0a5143728784b263d9f0238b8d595522689b3af2&limit=1&filter=completed // https://circleci.com/api/v1/project/BrightFlair/PHP.Gt?circle-token=0a5143728784b263d9f0238b8d595522689b3af2&limit=1&filter=completed
camp.route(/^\/circleci\/project\/([^\/]+\/[^\/]+)\/(.*)\.(svg|png|gif|jpg|json)$/, camp.route(/^\/circleci\/project\/([^\/]+\/[^\/]+)(?:\/(.*))?\.(svg|png|gif|jpg|json)$/,
cache(function(data, match, sendBadge, request) { cache(function(data, match, sendBadge, request) {
var userRepo = match[1]; // eg, `doctrine/orm`. var userRepo = match[1]; // eg, `doctrine/orm`.
var branch = match[2]; var branch = match[2];
var format = match[3]; var format = match[3];
var apiUrl = 'https://circleci.com/api/v1/project/'
+ userRepo var apiUrl = 'https://circleci.com/api/v1/project/' + userRepo;
+ "/tree/" if(branch != null) {
+ branch apiUrl +=
+ '?circle-token=0a5143728784b263d9f0238b8d595522689b3af2' "/tree/"
+ branch;
}
apiUrl +=
'?circle-token=0a5143728784b263d9f0238b8d595522689b3af2'
+ '&limit=1&filter=completed'; + '&limit=1&filter=completed';
var badgeData = getBadgeData('CircleCI', data); var badgeData = getBadgeData('CircleCI', data);
request(apiUrl, function(err, res, buffer) { request(apiUrl, function(err, res, buffer) {
if (err != null) { if (err != null) {
badgeData.text[1] = 'inaccessible'; badgeData.text[1] = 'inaccessible';
sendBadge(format, badgeData); sendBadge(format, badgeData);
} }
try { try {
// In case the request() implementation doesn't set the request header,
// we need to remove the first line of the response.
if(buffer.indexOf("//") === 0) {
buffer = buffer.substring(buffer.indexOf("\n"));
}
var data = JSON.parse(buffer); var data = JSON.parse(buffer);
var status = data[0].status; var status = data[0].status;
switch(status) { switch(status) {