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

Make non-us itunes links work

Browse source
This commit is contained in:
Jonathan Cremin 2014-12-06 21:12:52 +00:00
parent a471a984f8
commit e87dd27885
2 changed files with 27 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

26
lib/services/itunes.js
View file

@ -12,9 +12,21 @@ module.exports.match = function(url, type) {
return parsed.host.match(/itunes.apple\.com$/); return parsed.host.match(/itunes.apple\.com$/);
}; };
module.exports.lookupId = function(id, type) { module.exports.lookupId = function(id, type, cc) {
var deferred = Q.defer(); var deferred = Q.defer();
if (id.match(/^[a-z]{2}/)) {
cc = id.substr(0,2);
id = id.substr(2);
console.log(id)
}
var path = "/lookup?id=" + id; var path = "/lookup?id=" + id;
if (cc) {
path = "/" + cc + path;
}
console.log(path)
request.get(apiRoot + path, function(res) { request.get(apiRoot + path, function(res) {
var data = JSON.parse(res.text); var data = JSON.parse(res.text);
@ -29,7 +41,7 @@ module.exports.lookupId = function(id, type) {
var item = { var item = {
service: "itunes", service: "itunes",
type: type, type: type,
id: result.collectionId, id: cc + result.collectionId,
name: result.trackName ? result.trackName : result.collectionName, name: result.trackName ? result.trackName : result.collectionName,
streamUrl: null, streamUrl: null,
purchaseUrl: result.collectionViewUrl, purchaseUrl: result.collectionViewUrl,
@ -89,7 +101,7 @@ module.exports.search = function(data) {
var item = { var item = {
service: "itunes", service: "itunes",
type: type, type: type,
id: result.collectionId, id: "us" + result.collectionId,
name: result.trackName ? result.trackName : result.collectionName, name: result.trackName ? result.trackName : result.collectionName,
streamUrl: null, streamUrl: null,
purchaseUrl: result.collectionViewUrl, purchaseUrl: result.collectionViewUrl,
@ -113,10 +125,12 @@ module.exports.search = function(data) {
module.exports.parseUrl = function(url) { module.exports.parseUrl = function(url) {
var deferred = Q.defer(); var deferred = Q.defer();
var matches = parse(url).path.match(/\/(album|track)[\/]+([^\/]+)[\/]+([^\?]+)/); var matches = parse(url).path.match(/[\/]?([\/]?[a-z]{2}?)?\/(album|track)[\/]+([^\/]+)[\/]+([^\?]+)/);
if (matches && matches[3]) { if (matches && matches[4]) {
module.exports.lookupId(matches[3].substr(2), matches[1]).then(deferred.resolve); module.exports.lookupId(matches[4].substr(2), matches[2], matches[1]).then(deferred.resolve, deferred.reject);
} else if (matches[3]) {
module.exports.lookupId(matches[3].substr(2), matches[1], "").then(deferred.resolve, deferred.reject);
} }
return deferred.promise; return deferred.promise;
} }

10
routes/search.js
View file

@ -12,7 +12,7 @@ require("fs").readdirSync(path.join(__dirname, "..", "lib", "services")).forEach
} }
}); });
module.exports = function(req, res) { module.exports = function(req, res, next) {
var url = parse(req.body.url); var url = parse(req.body.url);
var searching = false; var searching = false;
@ -35,13 +35,17 @@ module.exports = function(req, res) {
if (error.code == "ETIMEDOUT") { if (error.code == "ETIMEDOUT") {
error = new Error("Error talking to music service"); error = new Error("Error talking to music service");
error.status = "502"; error.status = "502";
next(error);
} else if (!error.status) { } else if (!error.status) {
error = new Error("An unexpected error happenend"); error = new Error("An unexpected error happenend");
error.status = 500; error.status = 500;
next(error);
} else if (error.status == 404){
req.flash('search-error', 'No match found for this link');
res.redirect('/');
} }
next(error);
});
});
break; break;
} }
} }