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

Use the cached request everywhere

Browse Source
This commit is contained in:
Thaddee Tyl 2014-10-11 13:45:56 +02:00
parent 6fc4b1189c
commit de875f74b8
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
server.js
View File

@ -450,7 +450,7 @@ cache(function(data, match, sendBadge, request) {
// HHVM integration. // HHVM integration.
camp.route(/^\/hhvm\/([^\/]+\/[^\/]+)(\/.+)?\.(svg|png|gif|jpg)$/, camp.route(/^\/hhvm\/([^\/]+\/[^\/]+)(\/.+)?\.(svg|png|gif|jpg)$/,
cache(function(data, match, sendBadge) { cache(function(data, match, sendBadge, request) {
var user = match[1]; // eg, `symfony/symfony`. var user = match[1]; // eg, `symfony/symfony`.
var branch = match[2];// eg, `/2.4.0.0`. var branch = match[2];// eg, `/2.4.0.0`.
var format = match[3]; var format = match[3];
@ -1629,7 +1629,7 @@ function mapNugetFeed(pattern, offset, getInfo) {
var vPreRegex = new RegExp('^\\/' + pattern + '\\/vpre\\/(.*)\\.(svg|png|gif|jpg)$'); var vPreRegex = new RegExp('^\\/' + pattern + '\\/vpre\\/(.*)\\.(svg|png|gif|jpg)$');
var dtRegex = new RegExp('^\\/' + pattern + '\\/dt\\/(.*)\\.(svg|png|gif|jpg)$'); var dtRegex = new RegExp('^\\/' + pattern + '\\/dt\\/(.*)\\.(svg|png|gif|jpg)$');
function getNugetPackage(apiUrl, id, includePre, done) { function getNugetPackage(apiUrl, id, includePre, request, done) {
var filter = includePre ? var filter = includePre ?
'Id eq \'' + id + '\' and IsAbsoluteLatestVersion eq true' : 'Id eq \'' + id + '\' and IsAbsoluteLatestVersion eq true' :
'Id eq \'' + id + '\' and IsLatestVersion eq true'; 'Id eq \'' + id + '\' and IsLatestVersion eq true';
@ -1647,7 +1647,7 @@ function mapNugetFeed(pattern, offset, getInfo) {
var result = data.d.results[0]; var result = data.d.results[0];
if (result == null) { if (result == null) {
if (includePre === null) { if (includePre === null) {
getNugetPackage(apiUrl, id, true, done); getNugetPackage(apiUrl, id, true, request, done);
} else { } else {
done(new Error('Package not found in feed')); done(new Error('Package not found in feed'));
} }
@ -1662,14 +1662,14 @@ function mapNugetFeed(pattern, offset, getInfo) {
} }
camp.route(vRegex, camp.route(vRegex,
cache(function(data, match, sendBadge) { cache(function(data, match, sendBadge, request) {
var info = getInfo(match); var info = getInfo(match);
var site = info.site; // eg, `Chocolatey`, or `YoloDev` var site = info.site; // eg, `Chocolatey`, or `YoloDev`
var repo = match[offset + 1]; // eg, `Nuget.Core`. var repo = match[offset + 1]; // eg, `Nuget.Core`.
var format = match[offset + 2]; var format = match[offset + 2];
var apiUrl = info.feed; var apiUrl = info.feed;
var badgeData = getBadgeData(site, data); var badgeData = getBadgeData(site, data);
getNugetPackage(apiUrl, repo, null, function(err, data) { getNugetPackage(apiUrl, repo, null, request, function(err, data) {
if (err != null) { if (err != null) {
badgeData.text[1] = 'inaccessible'; badgeData.text[1] = 'inaccessible';
sendBadge(format, badgeData); sendBadge(format, badgeData);
@ -1693,14 +1693,14 @@ function mapNugetFeed(pattern, offset, getInfo) {
})); }));
camp.route(vPreRegex, camp.route(vPreRegex,
cache(function(data, match, sendBadge) { cache(function(data, match, sendBadge, request) {
var info = getInfo(match); var info = getInfo(match);
var site = info.site; // eg, `Chocolatey`, or `YoloDev` var site = info.site; // eg, `Chocolatey`, or `YoloDev`
var repo = match[offset + 1]; // eg, `Nuget.Core`. var repo = match[offset + 1]; // eg, `Nuget.Core`.
var format = match[offset + 2]; var format = match[offset + 2];
var apiUrl = info.feed; var apiUrl = info.feed;
var badgeData = getBadgeData(site, data); var badgeData = getBadgeData(site, data);
getNugetPackage(apiUrl, repo, true, function(err, data) { getNugetPackage(apiUrl, repo, true, request, function(err, data) {
if (err != null) { if (err != null) {
badgeData.text[1] = 'inaccessible'; badgeData.text[1] = 'inaccessible';
sendBadge(format, badgeData); sendBadge(format, badgeData);
@ -1724,14 +1724,14 @@ function mapNugetFeed(pattern, offset, getInfo) {
})); }));
camp.route(dtRegex, camp.route(dtRegex,
cache(function(data, match, sendBadge) { cache(function(data, match, sendBadge, request) {
var info = getInfo(match); var info = getInfo(match);
var site = info.site; // eg, `Chocolatey`, or `YoloDev` var site = info.site; // eg, `Chocolatey`, or `YoloDev`
var repo = match[offset+ 1]; // eg, `Nuget.Core`. var repo = match[offset+ 1]; // eg, `Nuget.Core`.
var format = match[offset + 2]; var format = match[offset + 2];
var apiUrl = info.feed; var apiUrl = info.feed;
var badgeData = getBadgeData(site, data); var badgeData = getBadgeData(site, data);
getNugetPackage(apiUrl, repo, null, function(err, data) { getNugetPackage(apiUrl, repo, null, request, function(err, data) {
if (err != null) { if (err != null) {
badgeData.text[1] = 'inaccessible'; badgeData.text[1] = 'inaccessible';
sendBadge(format, badgeData); sendBadge(format, badgeData);