jonathan/combine.fm
jonathan/combine.fm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Stop sending headers twice.

Browse source
This commit is contained in:
Jonathan Cremin 2014-12-06 18:16:31 +00:00
parent a2c7a51784
commit a471a984f8
1 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

48
routes/search.js
View file

@ -19,31 +19,31 @@ module.exports = function(req, res) {
if (!url.host) { if (!url.host) {
req.flash('search-error', 'Paste a music link above to find and share the matches'); req.flash('search-error', 'Paste a music link above to find and share the matches');
res.redirect('/'); res.redirect('/');
return; } else {
} for (var id in services) {
var matched = services[id].match(req.body.url);
if (matched) {
searching = true;
Q.timeout(services[id].parseUrl(req.body.url), 5000).then(function(result) {
if (!result.id) {
req.flash('search-error', 'No match found for this link');
res.redirect('/');
} else {
res.redirect("/" + id + "/" + result.type + "/" + result.id);
}
}, function(error) {
if (error.code == "ETIMEDOUT") {
error = new Error("Error talking to music service");
error.status = "502";
} else if (!error.status) {
error = new Error("An unexpected error happenend");
error.status = 500;
}
next(error);
});
for (var id in services) { break;
var matched = services[id].match(req.body.url); }
if (matched) {
searching = true;
Q.timeout(services[id].parseUrl(req.body.url), 5000).then(function(result) {
if (!result.id) {
req.flash('search-error', 'No match found for this link');
res.redirect('/');
}
res.redirect("/" + id + "/" + result.type + "/" + result.id);
}, function(error) {
if (error.code == "ETIMEDOUT") {
error = new Error("Error talking to music service");
error.status = "502";
} else if (!error.status) {
error = new Error("An unexpected error happenend");
error.status = 500;
}
next(error);
});
break;
} }
} }
if (!searching) { if (!searching) {