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

Add rdio support

Browse source
This commit is contained in:
Jonathan Cremin 2014-12-01 11:53:25 +00:00
parent aca2eea4dd
commit 493482386e
7 changed files with 129 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

20
lib/googleplaymusic.js
View file

@ -37,26 +37,22 @@ module.exports.search = function(query, type, next) {
}
module.exports.parseUrl = function(url, next) {
// https://play.google.com/music/listen#/album/B3lxthejqxjxja2bhzchcw5qaci
// https://play.google.com/music/listen#/album//Underworld/Everything%2C+Everything+(Live)
var parsed = parse(url.replace(/\+/g, "%20"));
var path = parsed.path;
var hash = parsed.hash;
console.log(path)
if (hash) {
var matches = hash.match(/\/album[\/]+([^\/]+)\/([^\/]+)/);
var parts = hash.split("/");
var type = parts[1];
var id = parts[2];
var artist = decodeURIComponent(parts[3]);
var album = decodeURIComponent(parts[4]);
if (matches && matches[2]) {
var artist = decodeURIComponent(matches[1]);
var album = decodeURIComponent(matches[2]);
if (id.length > 0) {
return next({id: id, type: type});
} else {
module.exports.search(artist + " " + album, "album", function(googleAlbum) {
next(googleAlbum);
});
} else {
var matches = hash.match(/\/album[\/]+([\w]+)/);
if (matches && matches[1]) {
return next({id:matches[1], type: "album"});
}
}
} else if(path) {
var matches = path.match(/\/music\/m\/([\w]+)/);