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

Update deps, refactor rdio for 3.1

Browse source
This commit is contained in:
Jonathan Cremin 2015-08-20 00:23:42 +01:00
parent 24b17261aa
commit cb711ea510
6 changed files with 84 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

100
lib/services/rdio/index.js
View file

@ -1,32 +1,34 @@
'use strict';
var parse = require('url').parse;
var Promise = require('bluebird');
import { parse } from 'url';
import bluebird from 'bluebird';
import rdioInit from 'rdio';
import { match as urlMatch } from './url';
module.exports.id = 'rdio';
export let id = 'rdio';
if (!process.env.RDIO_CLIENT_ID || !process.env.RDIO_CLIENT_SECRET || !process.env.RDIO_REFRESH_TOKEN) {
console.warn('RDIO_CLIENT_ID, RDIO_REFRESH_TOKEN or RDIO_CLIENT_SECRET environment variables not found, deactivating Rdio.');
} else {
console.warn('RDIO_CLIENT_ID, RDIO_REFRESH_TOKEN or RDIO_CLIENT_SECRET environment constiables not found, deactivating Rdio.');
}
var Rdio = require('rdio');
var rdio = new Rdio({
clientId: process.env.RDIO_CLIENT_ID,
clientSecret: process.env.RDIO_CLIENT_SECRET,
refreshToken: process.env.RDIO_REFRESH_TOKEN
const Rdio = rdioInit({
rdio: {
clientId: process.env.RDIO_CLIENT_ID,
clientSecret: process.env.RDIO_CLIENT_SECRET,
}
});
var rdio = Promise.promisifyAll(rdio);
const rdio = bluebird.promisifyAll(new Rdio());
module.exports.match = require('./url').match;
export const match = urlMatch;
module.exports.lookupId = function*(id) {
yield rdio.loginAsync();
var result = yield rdio.callAsync('getObjectFromShortCode', {'short_code': id});
var parsedShortUrl = parse(result.shortUrl);
var rid = parsedShortUrl.path.replace('/x/', '').replace('/', '');
var type = result.album ? 'track' : 'album';
export function* lookupId(id) {
yield rdio.getClientTokenAsync();
const response = yield rdio.requestAsync({method: 'getObjectFromShortCode', short_code: id}, false);
const result = response.result;
const parsedShortUrl = parse(result.shortUrl);
const rid = parsedShortUrl.path.replace('/x/', '').replace('/', '');
const type = result.album ? 'track' : 'album';
var item = {
const item = {
service: 'rdio',
type: type,
id: rid,
@ -49,30 +51,34 @@ module.exports.lookupId = function*(id) {
return item;
};
module.exports.parseUrl = function *(url) {
var parsedUrl = parse(url);
export function* parseUrl(url) {
const parsedUrl = parse(url);
var method;
var args;
let query, args;
if (parsedUrl.host === 'rd.io') {
method = 'getObjectFromShortCode';
args = {'short_code': parsedUrl.path.replace('/x/', '').replace('/', '')};
query = {
method: 'getObjectFromShortCode',
short_code: parsedUrl.path.replace('/x/', '').replace('/', '')
};
} else if (parsedUrl.host.match(/rdio\.com$/)) {
method = 'getObjectFromUrl';
args = {url: parsedUrl.path};
query = {
method: 'getObjectFromUrl',
url: parsedUrl.path
};
} else {
var error = new Error('Not Found');
const error = new Error('Not Found');
error.status = 404;
throw error;
}
yield rdio.loginAsync();
var result = yield rdio.callAsync(method, args);
var parsedShortUrl = parse(result.shortUrl);
var id = parsedShortUrl.path.replace('/x/', '').replace('/', '');
var type = result.album ? 'track' : 'album';
var item = {
yield rdio.getClientTokenAsync();
const response = yield rdio.requestAsync(query, false);
const result = response.result;
const parsedShortUrl = parse(result.shortUrl);
const id = parsedShortUrl.path.replace('/x/', '').replace('/', '');
const type = result.album ? 'track' : 'album';
const item = {
service: 'rdio',
type: type,
id: id,
@ -95,9 +101,9 @@ module.exports.parseUrl = function *(url) {
return item;
};
module.exports.search = function *(data) {
var query, albumClean;
var type = data.type;
export function* search(data) {
let query, albumClean;
const type = data.type;
if (type === 'album') {
query = data.artist.name + ' ' + data.name;
@ -111,9 +117,9 @@ module.exports.search = function *(data) {
}
}
yield rdio.loginAsync();
var response = yield rdio.callAsync('search', {query: query, types: type});
var result = response.results.filter(function(item) {
yield rdio.getClientTokenAsync();
const response = yield rdio.requestAsync({method: 'search', query: query, types: type}, false);
const result = response.result.results.filter(function(item) {
if (type === 'album' && item.name.match(/([^\(\[]+)/)[0] === albumClean) {
return item;
} else if (type === 'track' && (item.album.match(/([^\(\[]+)/)[0] === albumClean || !albumClean)) {
@ -122,9 +128,9 @@ module.exports.search = function *(data) {
}).shift();
if (!result) {
var matches = albumClean.match(/^[^\(\[]+/);
const matches = albumClean.match(/^[^\(\[]+/);
if (matches && matches[0] && matches[0] !== albumClean) {
var cleanedData = JSON.parse(JSON.stringify(data));
const cleanedData = JSON.parse(JSON.stringify(data));
if (type === 'album') {
cleanedData.name = matches[0].trim();
} else if (type === 'track') {
@ -135,9 +141,9 @@ module.exports.search = function *(data) {
return {service: 'rdio'};
}
} else {
var parsedShortUrl = parse(result.shortUrl);
var id = parsedShortUrl.path.replace('/x/', '').replace('/', '');
var item = {
const parsedShortUrl = parse(result.shortUrl);
const id = parsedShortUrl.path.replace('/x/', '').replace('/', '');
const item = {
service: 'rdio',
type: type,
id: id,
@ -160,5 +166,3 @@ module.exports.search = function *(data) {
return item;
}
};
}

5
lib/services/rdio/url.js
View file

@ -1,7 +1,6 @@
"use strict";
var parse = require('url').parse;
import { parse } from 'url';
module.exports.match = function(url) {
export function match(url) {
var parsed = parse(url);
if (!parsed.host.match(/rd\.io$/) && !parsed.host.match(/rdio\.com$/)) {
return false;