Merge remote-tracking branch 'yolodev/feature-nuget-pre'

Conflicts:
	server.js
This commit is contained in:
Thaddee Tyl 2014-09-30 21:44:44 +02:00
commit 2a2b8f983a
2 changed files with 144 additions and 150 deletions

146
server.js
View File

@ -1512,9 +1512,17 @@ cache(function(data, match, sendBadge) {
}); });
})); }));
function getNugetPackage(apiUrl, id, done) { function mapNugetFeed(pattern, offset, getInfo) {
var filter = 'Id eq \'' + id + '\' and IsLatestVersion eq true'; var vRegex = new RegExp('^\\/' + pattern + '\\/v\\/(.*)\\.(svg|png|gif|jpg)$');
var vPreRegex = new RegExp('^\\/' + pattern + '\\/vpre\\/(.*)\\.(svg|png|gif|jpg)$');
var dtRegex = new RegExp('^\\/' + pattern + '\\/dt\\/(.*)\\.(svg|png|gif|jpg)$');
function getNugetPackage(apiUrl, id, includePre, done) {
var filter = includePre ?
'Id eq \'' + id + '\' and IsAbsoluteLatestVersion eq true' :
'Id eq \'' + id + '\' and IsLatestVersion eq true';
var reqUrl = apiUrl + '/Packages()?$filter=' + encodeURIComponent(filter); var reqUrl = apiUrl + '/Packages()?$filter=' + encodeURIComponent(filter);
console.log('nuget-query(%s, %s, %s): %s', apiUrl, id, includePre, reqUrl);
request(reqUrl, { headers: { 'Accept': 'application/atom+json,application/json' } }, function(err, res, buffer) { request(reqUrl, { headers: { 'Accept': 'application/atom+json,application/json' } }, function(err, res, buffer) {
if (err != null) { if (err != null) {
done(err); done(err);
@ -1525,27 +1533,11 @@ function getNugetPackage(apiUrl, id, done) {
var data = JSON.parse(buffer); var data = JSON.parse(buffer);
var result = data.d.results[0]; var result = data.d.results[0];
if (result == null) { if (result == null) {
// package was not found, might be pre-release only if (includePre === null) {
var filter = 'Id eq \'' + id + '\' and IsAbsoluteLatestVersion eq true'; getNugetPackage(apiUrl, id, true, done);
var reqUrl = apiUrl + '/Packages()?$filter=' + encodeURIComponent(filter);
request(reqUrl, { headers: { 'Accept': 'application/atom+json,application/json' } }, function(err, res, buffer) {
if (err != null) {
done(err);
return;
}
try {
var data = JSON.parse(buffer);
var result = data.d.results[0];
if (result == null) {
done(null, null);
} else { } else {
done (null, result); done(new Error('Package not found in feed'));
} }
} catch(e) {
done(e);
}
});
} else { } else {
done(null, result); done(null, result);
} }
@ -1556,15 +1548,15 @@ function getNugetPackage(apiUrl, id, done) {
}); });
} }
// NuGet/chocolatey version integration. camp.route(vRegex,
camp.route(/^\/(nuget|chocolatey)\/v\/(.*)\.(svg|png|gif|jpg)$/,
cache(function(data, match, sendBadge) { cache(function(data, match, sendBadge) {
var site = match[1]; var info = getInfo(match);
var repo = match[2]; // eg, `Nuget.Core`. var site = info.site; // eg, `Chocolatey`, or `YoloDev`
var format = match[3]; var repo = match[offset + 1]; // eg, `Nuget.Core`.
var apiUrl = 'https://www.' + site + '.org/api/v2'; var format = match[offset + 2];
var apiUrl = info.feed;
var badgeData = getBadgeData(site, data); var badgeData = getBadgeData(site, data);
getNugetPackage(apiUrl, repo, function(err, data) { getNugetPackage(apiUrl, repo, null, function(err, data) {
if (err != null) { if (err != null) {
badgeData.text[1] = 'inaccessible'; badgeData.text[1] = 'inaccessible';
sendBadge(format, badgeData); sendBadge(format, badgeData);
@ -1587,15 +1579,15 @@ cache(function(data, match, sendBadge) {
}); });
})); }));
// MyGet version integration. camp.route(vPreRegex,
camp.route(/^\/myget\/(.*)\/v\/(.*)\.(svg|png|gif|jpg)$/,
cache(function(data, match, sendBadge) { cache(function(data, match, sendBadge) {
var feed = match[1]; // eg yolodev var info = getInfo(match);
var repo = match[2]; // eg FSharpSupport var site = info.site; // eg, `Chocolatey`, or `YoloDev`
var format = match[3]; // eg svg or png var repo = match[offset + 1]; // eg, `Nuget.Core`.
var apiUrl = 'https://www.myget.org/F/' + feed + '/api/v2'; var format = match[offset + 2];
var badgeData = getBadgeData(feed, data); var apiUrl = info.feed;
getNugetPackage(apiUrl, repo, function(err, data) { var badgeData = getBadgeData(site, data);
getNugetPackage(apiUrl, repo, true, function(err, data) {
if (err != null) { if (err != null) {
badgeData.text[1] = 'inaccessible'; badgeData.text[1] = 'inaccessible';
sendBadge(format, badgeData); sendBadge(format, badgeData);
@ -1618,55 +1610,49 @@ cache(function(data, match, sendBadge) {
}); });
})); }));
// NuGet/chocolatey download count integration. camp.route(dtRegex,
camp.route(/^\/(nuget|chocolatey)\/dt\/(.*)\.(svg|png|gif|jpg)$/,
cache(function(data, match, sendBadge) { cache(function(data, match, sendBadge) {
var info = getInfo(match);
var site = info.site; // eg, `Chocolatey`, or `YoloDev`
var repo = match[offset+ 1]; // eg, `Nuget.Core`.
var format = match[offset + 2];
var apiUrl = info.feed;
var badgeData = getBadgeData(site, data);
getNugetPackage(apiUrl, repo, null, function(err, data) {
if (err != null) {
badgeData.text[1] = 'inaccessible';
sendBadge(format, badgeData);
}
try {
var downloads = data.DownloadCount;
badgeData.text[1] = metric(downloads) + ' total';
badgeData.colorscheme = downloadCountColor(downloads);
sendBadge(format, badgeData);
} catch(e) {
badgeData.text[1] = 'invalid';
sendBadge(format, badgeData);
}
});
}));
}
// NuGet and Chocolatey
mapNugetFeed('(nuget|chocolatey)', 1, function(match) {
var site = match[1]; var site = match[1];
var repo = match[2]; // eg, `Nuget.Core`. return {
var format = match[3]; site: site,
var apiUrl = 'https://www.' + site + '.org/api/v2'; feed: 'https://www.' + site + '.org/api/v2'
var badgeData = getBadgeData('downloads', data); };
getNugetPackage(apiUrl, repo, function(err, data) {
if (err != null) {
badgeData.text[1] = 'inaccessible';
sendBadge(format, badgeData);
}
try {
var downloads = data.DownloadCount;
badgeData.text[1] = metric(downloads) + ' total';
badgeData.colorscheme = downloadCountColor(downloads);
sendBadge(format, badgeData);
} catch(e) {
badgeData.text[1] = 'invalid';
sendBadge(format, badgeData);
}
}); });
}));
// MyGet download count integration. // MyGet
camp.route(/^\/myget\/(.*)\/dt\/(.*)\.(svg|png|gif|jpg)$/, mapNugetFeed('myget\\/(.*)', 1, function(match) {
cache(function(data, match, sendBadge) { var feed = match[1];
var feed = match[1]; // eg yolodev return {
var repo = match[2]; // eg FSharpSupport site: feed,
var format = match[3]; // eg svg or png feed: 'https://www.myget.org/F/' + feed + '/api/v2'
var apiUrl = 'https://www.myget.org/F/' + feed + '/api/v2'; };
var badgeData = getBadgeData('downloads', data);
getNugetPackage(apiUrl, repo, function(err, data) {
if (err != null) {
badgeData.text[1] = 'inaccessible';
sendBadge(format, badgeData);
}
try {
var downloads = data.DownloadCount;
badgeData.text[1] = metric(downloads) + ' total';
badgeData.colorscheme = downloadCountColor(downloads);
sendBadge(format, badgeData);
} catch(e) {
badgeData.text[1] = 'invalid';
sendBadge(format, badgeData);
}
}); });
}));
// Puppet Forge // Puppet Forge
camp.route(/^\/puppetforge\/v\/([^\/]+\/[^\/]+)\.(svg|png|gif|jpg)$/, camp.route(/^\/puppetforge\/v\/([^\/]+\/[^\/]+)\.(svg|png|gif|jpg)$/,

View File

@ -338,10 +338,18 @@ I made the GitHub Badge Service.
<td><img src='/nuget/v/Nuget.Core.svg' alt=''/></td> <td><img src='/nuget/v/Nuget.Core.svg' alt=''/></td>
<td><code>http://img.shields.io/nuget/v/Nuget.Core.svg</code></td> <td><code>http://img.shields.io/nuget/v/Nuget.Core.svg</code></td>
</tr> </tr>
<tr><th> NuGet Pre Release: </th>
<td><img src='/nuget/vpre/Nuget.Core.svg' alt=''/></td>
<td><code>http://img.shields.io/nuget/vpre/Nuget.Core.svg</code></td>
</tr>
<tr><th> MyGet: </th> <tr><th> MyGet: </th>
<td><img src='/myget/yolodev/v/FSharpSupport.svg' alt=''/></td> <td><img src='/myget/yolodev/v/FSharpSupport.svg' alt=''/></td>
<td><code>http://img.shields.io/myget/yolodev/v/FSharpSupport.svg</code></td> <td><code>http://img.shields.io/myget/yolodev/v/FSharpSupport.svg</code></td>
</tr> </tr>
<tr><th> MyGet Pre Release: </th>
<td><img src='/myget/yolodev/vpre/FSharpSupport.svg' alt=''/></td>
<td><code>http://img.shields.io/myget/yolodev/vpre/FSharpSupport.svg</code></td>
</tr>
<tr><th> Chocolatey: </th> <tr><th> Chocolatey: </th>
<td><img src='/chocolatey/v/git.svg' alt=''/></td> <td><img src='/chocolatey/v/git.svg' alt=''/></td>
<td><code>http://img.shields.io/chocolatey/v/git.svg</code></td> <td><code>http://img.shields.io/chocolatey/v/git.svg</code></td>