Fix google search

This commit is contained in:
Jonathan Cremin 2014-12-05 14:32:03 +00:00
parent 8802ffe959
commit d675ac4e9f

View file

@ -11,8 +11,11 @@ if (!process.env.GOOGLE_EMAIL || !process.env.GOOGLE_PASSWORD) {
return; return;
} }
// It's probably ok to not wait for this to finish var ready = Q.defer();
pm.init({email: process.env.GOOGLE_EMAIL, password: process.env.GOOGLE_PASSWORD}, function() {});
pm.init({email: process.env.GOOGLE_EMAIL, password: process.env.GOOGLE_PASSWORD}, function() {
ready.resolve();
});
module.exports.match = function(url, type) { module.exports.match = function(url, type) {
var parsed = parse(url); var parsed = parse(url);
@ -21,115 +24,121 @@ module.exports.match = function(url, type) {
module.exports.lookupId = function(id, type, next) { module.exports.lookupId = function(id, type, next) {
var deferred = Q.defer(); var deferred = Q.defer();
if (type == "album") { ready.promise.then(function() {
pm.getAlbum(id, true, function(album) { if (type == "album") {
deferred.resolve({ pm.getAlbum(id, true, function(album) {
service: "googleplaymusic", deferred.resolve({
type: "album", service: "googleplaymusic",
id: album.albumId, type: "album",
name: album.name, id: album.albumId,
streamUrl: "https://play.google.com/music/listen#/album/" + album.albumId, name: album.name,
purchaseUrl: "https://play.google.com/store/music/album?id=" + album.albumId, streamUrl: "https://play.google.com/music/listen#/album/" + album.albumId,
artwork: album.albumArtRef.replace("http:", ""), purchaseUrl: "https://play.google.com/store/music/album?id=" + album.albumId,
artist: { artwork: album.albumArtRef.replace("http:", ""),
name: album.artist artist: {
} name: album.artist
}
});
}); });
}); } else if (type == "track") {
} else if (type == "track") { pm.getAllAccessTrack(id, function(track) {
pm.getAllAccessTrack(id, function(track) { deferred.resolve({
deferred.resolve({ service: "googleplaymusic",
service: "googleplaymusic", type: "track",
type: "track", id: track.nid,
id: track.nid, name: track.title,
name: track.title, streamUrl: "https://play.google.com/music/listen#/track/" + track.nid + "/" + track.albumId,
streamUrl: "https://play.google.com/music/listen#/track/" + track.nid + "/" + track.albumId, purchaseUrl: "https://play.google.com/store/music/album?id=" + track.albumId,
purchaseUrl: "https://play.google.com/store/music/album?id=" + track.albumId, artwork: track.albumArtRef[0].url.replace("http:", ""),
artwork: track.albumArtRef[0].url.replace("http:", ""), album: {
album: { name: track.album
name: track.album },
}, artist: {
artist: { name: track.artist
name: track.artist }
} });
}); });
}); }
} });
return deferred.promise; return deferred.promise;
} }
module.exports.search = function(data) { module.exports.search = function(data) {
var deferred = Q.defer(); var deferred = Q.defer();
var query = ""; ready.promise.then(function() {
var type = data.type; var query, album;
var type = data.type;
if (type == "album") { if (type == "album") {
query = data.artist.name + " " + data.name; query = data.artist.name + " " + data.name;
album = data.name; album = data.name;
} else if (type == "track") { } else if (type == "track") {
query = data.artist.name + " " + data.album.name + " " + data.name; query = data.artist.name + " " + data.album.name + " " + data.name;
album = data.album.name; album = data.album.name;
}
pm.search(query, 5, function(data) {
if (!data.entries) {
deferred.resolve({service: "googleplaymusic"});
return;
} }
var result = data.entries.filter(function(result) {
return result[type];
}).sort(function(a, b) { // sort by match score
return a.score < b.score;
}).shift();
if (!result) { pm.search(query, 5, function(data) {
var matches = album.match(/^[^\(\[]+/); if (!data.entries) {
if (matches[0]) { var matches = album.match(/^[^\(\[]+/);
var cleanedData = JSON.parse(JSON.stringify(data)); if (matches[0]) {
if (type == "album") { var cleanedData = JSON.parse(JSON.stringify(data));
cleanedData.name = matches[0].trim(); if (type == "album") {
} else if (type == "track") { cleanedData.name = matches[0].trim();
cleanedData.album = matches[0].trim(); } else if (type == "track") {
cleanedData.album = matches[0].trim();
}
module.exports.search(cleanedData).then(deferred.resolve);
} else {
deferred.resolve({service: "googleplaymusic"});
} }
module.exports.search(cleanedData).then(deferred.resolve); return;
} else {
deferred.resolve({service: "googleplaymusic"});
}
} else {
var id;
if (type == "album") {
id = result.album.albumId;
} else if (type == "track") {
id = result.track.nid;
} }
var result = data.entries.filter(function(result) {
return result[type];
}).sort(function(a, b) { // sort by match score
return a.score < b.score;
}).shift();
module.exports.lookupId(id, type).then(deferred.resolve); if (!result) {
} deferred.resolve({service: "googleplaymusic"});
} else {
var id;
if (type == "album") {
id = result.album.albumId;
} else if (type == "track") {
id = result.track.nid;
}
module.exports.lookupId(id, type).then(deferred.resolve);
}
});
}); });
return deferred.promise; return deferred.promise;
} }
module.exports.parseUrl = function(url, next) { module.exports.parseUrl = function(url, next) {
var deferred = Q.defer(); var deferred = Q.defer();
var parsed = parse(url.replace(/\+/g, "%20")); ready.promise.then(function() {
var path = parsed.path; var parsed = parse(url.replace(/\+/g, "%20"));
var hash = parsed.hash; var path = parsed.path;
if (hash) { var hash = parsed.hash;
var parts = hash.split("/"); if (hash) {
var type = parts[1]; var parts = hash.split("/");
var id = parts[2]; var type = parts[1];
var artist = decodeURIComponent(parts[3]); var id = parts[2];
var album = decodeURIComponent(parts[4]); var artist = decodeURIComponent(parts[3]);
var album = decodeURIComponent(parts[4]);
if (id.length > 0) { if (id.length > 0) {
deferred.resolve({id: id, type: type}); deferred.resolve({id: id, type: type});
} else { } else {
module.exports.search({type: type, name:album, artist: {name: artist}}).then(deferred.resolve); module.exports.search({type: type, name:album, artist: {name: artist}}).then(deferred.resolve);
}
} else if(path) {
var matches = path.match(/\/music\/m\/([\w]+)/);
var type = matches[1][0] == "T" ? "track" : "album";
module.exports.lookupId(matches[1], type).then(deferred.resolve);
} }
} else if(path) { });
var matches = path.match(/\/music\/m\/([\w]+)/);
var type = matches[1][0] == "T" ? "track" : "album";
module.exports.lookupId(matches[1], type).then(deferred.resolve);
}
return deferred.promise; return deferred.promise;
} }