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

Fix Google Play Music and Spotify

Browse source
This commit is contained in:
Jonathan Cremin 2017-07-20 14:31:07 +01:00
parent 688ec0f2f9
commit 6c29d50f1e
21 changed files with 566 additions and 559 deletions
Download patch file Download diff file Expand all files Collapse all files

155
lib/services/deezer/index.js
View file

@ -1,86 +1,110 @@
import { parse } from 'url';
import request from 'superagent';
import 'superagent-bluebird-promise';
import { match as urlMatch } from './url';
export let id = 'deezer';
import urlMatch from './url';
const apiRoot = 'https://api.deezer.com';
export const match = urlMatch;
export function parseUrl(url) {
let matches = parse(url).path.match(/\/(album|track)[\/]+([^\/]+)/);
const matches = parse(url).path.match(/\/(album|track)[/]+([^/]+)/);
if (matches && matches[2]) {
return module.exports.lookupId(matches[2], matches[1]);
} else {
throw new Error();
}
};
throw new Error();
}
function exactMatch(needle, haystack, type, various) {
// try to find exact match
return haystack.find((entry) => {
if (!entry[type] || (various && (entry.artist.name !== 'Various' || entry.artist.name !== 'Various Artists'))) {
return false;
}
const title = entry[type].title;
if (title) {
return entry;
}
return false;
});
}
function looseMatch(needle, haystack, type, various) {
// try to find exact match
return haystack.find((entry) => {
if (!entry[type] || (various && (entry.artist.name !== 'Various' || entry.artist.name !== 'Various Artists'))) {
return false;
}
const name = entry[type].title || entry[type].name;
if (name.indexOf(needle) >= 0) {
return entry[type];
}
return false;
});
}
export function* lookupId(id, type) {
let path = '/' + type + '/' + id;
const path = `/${type}/${id}`;
let {body} = yield request.get(apiRoot + path).promise();
const { body } = yield request.get(apiRoot + path).promise();
if (!body || body.error) {
let error = new Error('Not Found');
const error = new Error('Not Found');
error.status = 404;
return Promise.reject(error);
}
let item = body;
let coverUrl = item.cover || item.album.cover;
const item = body;
const coverUrl = item.cover || item.album.cover;
let cover = 'test';
// nasty hacks for superagent-bluebird-promise
try {
cover = yield request.get(coverUrl).redirects(0);
} catch(err) {
} catch (err) {
cover = err.originalError.response;
}
let artwork = {
const artwork = {
small: cover.headers.location.replace('120x120', '200x200'),
large: cover.headers.location.replace('120x120', '800x800')
large: cover.headers.location.replace('120x120', '800x800'),
};
if (type === 'album') {
return Promise.resolve({
service: 'deezer',
type: type,
type,
id: item.id,
name: item.title,
streamUrl: item.link,
purchaseUrl: null,
artwork: artwork,
artwork,
artist: {
name: item.artist.name
}
name: item.artist.name,
},
});
} else if (type === 'track') {
return Promise.resolve({
service: 'deezer',
type: type,
type,
id: item.id,
name: item.title,
streamUrl: item.album.link,
purchaseUrl: null,
artwork: artwork,
artwork,
artist: {
name: item.artist.name
name: item.artist.name,
},
album: {
name: item.album.title
}
name: item.album.title,
},
});
} else {
return Promise.reject(new Error());
}
};
return Promise.reject(new Error());
}
export function* search(data, original={}) {
let cleanParam = function(str) {
return str.replace(/[\:\?\&]+/, '');
};
let query, album;
let {type} = data;
export function* search(data, original = {}) {
function cleanParam(str) {
return str.replace(/[:?&]+/, '');
}
let query;
let album;
const { type } = data;
const various = data.artist.name === 'Various Artists' || data.artist.name === 'Various';
@ -89,65 +113,40 @@ export function* search(data, original={}) {
if (various) {
query = cleanParam(data.name);
} else {
query = cleanParam(data.artist.name) + ' ' + cleanParam(data.name);
query = `${cleanParam(data.artist.name)} ${cleanParam(data.name)}`;
}
album = data.name;
} else if (type === 'track') {
query = cleanParam(data.artist.name) + ' ' + cleanParam(data.albumName) + ' ' + cleanParam(data.name);
query = `${cleanParam(data.artist.name)} ${cleanParam(data.albumName)} ${cleanParam(data.name)}`;
album = data.albumName;
}
var path = '/search/' + type + '?q=' + encodeURIComponent(query);
const path = `/search/${type}?q=${encodeURIComponent(query)}`;
let response = yield request.get(apiRoot + path);
const response = yield request.get(apiRoot + path);
const name = original.name || data.name;
if (response.body.data.length > 0) {
let match;
if (!(match = exactMatch(name, response.body.data, data.type, various))) {
let match = exactMatch(name, response.body.data, data.type, various);
if (!match) {
match = looseMatch(name, response.body.data, data.type, various);
}
return yield module.exports.lookupId(response.body.data[0].id, type);
} else {
var matches = album.match(/^[^\(\[]+/);
if (matches && matches[0] && matches[0] !== album) {
var cleanedData = JSON.parse(JSON.stringify(data));
if (type === 'album') {
cleanedData.name = matches[0].trim();
} else if (type === 'track') {
cleanedData.albumName = matches[0].trim();
}
return yield module.exports.search(cleanedData, data);
} else {
return Promise.resolve({service: 'deezer'});
}
}
};
function exactMatch(needle, haystack, type, various) {
// try to find exact match
return haystack.find(function(entry) {
if (!entry[type] || (various && (entry.artist.name !== 'Various' || entry.artist.name !== 'Various Artists'))) {
return false;
const matches = album.match(/^[^([]+/);
if (matches && matches[0] && matches[0] !== album) {
const cleanedData = JSON.parse(JSON.stringify(data));
if (type === 'album') {
cleanedData.name = matches[0].trim();
} else if (type === 'track') {
cleanedData.albumName = matches[0].trim();
}
entry = entry[type];
if (entry.title === needle) {
return entry;
}
});
return yield module.exports.search(cleanedData, data);
}
return Promise.resolve({ service: 'deezer' });
}
function looseMatch(needle, haystack, type, various) {
// try to find exact match
return haystack.find(function(entry) {
if (!entry[type] || (various && (entry.artist.name !== 'Various' || entry.artist.name !== 'Various Artists'))) {
return false;
}
const name = entry[type].title || entry[type].name;
if (name.indexOf(needle) >= 0) {
return entry[type];
}
});
}
export const id = 'deezer';
export const match = urlMatch;

6
lib/services/deezer/url.js
View file

@ -1,10 +1,10 @@
import { parse } from 'url';
export function* match(url) {
export default function match(url) {
const parsed = parse(url);
if (!parsed.host.match(/deezer\.com$/)) {
return false;
}
const matches = parsed.path.match(/\/(album|track)[\/]+([^\/]+)/);
const matches = parsed.path.match(/\/(album|track)[/]+([^/]+)/);
return matches.length > 1;
};
}