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

Finally finished giant ES6 refactor

Browse source
This commit is contained in:
Jonathan Cremin 2015-08-20 23:22:57 +01:00
parent c6d48cc424
commit 03e2666958
39 changed files with 553 additions and 635 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,14 +1,15 @@
import {parse} from 'url';
import { parse } from 'url';
import request from 'superagent';
import 'superagent-bluebird-promise';
import { match as urlMatch } from './url';
module.exports.id = 'deezer';
export let id = 'deezer';
const apiRoot = 'https://api.deezer.com';
module.exports.match = require('./url').match;
export const match = urlMatch;
module.exports.parseUrl = function(url) {
export function parseUrl(url) {
let matches = parse(url).path.match(/\/(album|track)[\/]+([^\/]+)/);
if (matches && matches[2]) {
@ -18,7 +19,7 @@ module.exports.parseUrl = function(url) {
}
};
module.exports.lookupId = function* (id, type) {
export function* lookupId(id, type) {
let path = '/' + type + '/' + id;
let {body} = yield request.get(apiRoot + path).promise();
@ -74,7 +75,7 @@ module.exports.lookupId = function* (id, type) {
}
};
module.exports.search = function* (data) {
export function* search(data) {
let cleanParam = function(str) {
return str.replace(/[\:\?\&]+/, '');
};

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

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