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

Do a second search without trailing brackets

Browse source
This commit is contained in:
Jonathan Cremin 2014-12-05 14:13:47 +00:00
parent f7b1fcd53f
commit 8802ffe959
6 changed files with 113 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

25
lib/services/spotify.js
View file

@ -56,29 +56,40 @@ module.exports.lookupId = function(id, type) {
module.exports.search = function(data) {
var deferred = Q.defer();
var query = "";
var query, album;
var type = data.type;
if (type == "album") {
query = "artist:" + data.artist.name.replace(":", "") + " album:" + data.name.replace(":", "");
album = data.name;
} else if (type == "track") {
query = "artist:" + data.artist.name.replace(":", "") + " album:" + data.album.name.replace(":", "") + " track:" + data.name.replace(":", "");
album = data.album.name;
}
spotify.search({query: query, type: type}, function(err, data) {
if ( err ) {
console.log('Error occurred: ' + err);
deferred.resolve({service: "spotify"});
return;
}
if (!data[type + "s"].items[0]) {
deferred.resolve({service:"spotify"});
return;
var matches = album.match(/^[^\(\[]+/);
if (matches[0]) {
var cleanedData = JSON.parse(JSON.stringify(data));
if (type == "album") {
cleanedData.name = matches[0].trim();
} else if (type == "track") {
cleanedData.album = matches[0].trim();
}
module.exports.search(cleanedData).then(deferred.resolve);
} else {
deferred.resolve({service: "spotify"});
}
} else {
module.exports.lookupId(data[type + "s"].items[0].id, type).then(deferred.resolve);
}
var item = data[type + "s"].items[0];
module.exports.lookupId(item.id, type).then(deferred.resolve);
});
return deferred.promise;
}