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

Make Youtube matching work a little again

Browse source
This commit is contained in:
Jonathan Cremin 2017-11-12 00:33:56 +00:00
parent f757152c7d
commit a919d80f64
8 changed files with 49 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

12
routes/search.js
View file

@ -13,11 +13,11 @@ const queue = kue.createQueue({
});
export default function* () {
const url = parse(this.request.body.url);
debug(`URL ${url.href}`);
this.assert(url.host, 400, { error: { message: 'You need to submit a url.' } });
try {
const url = parse(this.request.body.url);
debug(`URL ${url.href}`);
this.assert(url.host, 400, { error: { message: 'You need to submit a url.' } });
const music = yield lookup(this.request.body.url);
this.assert(music, 400, { error: { message: 'No supported music found at that link :(' } });
@ -29,7 +29,7 @@ export default function* () {
services.forEach((service) => {
if (service.id !== share.service) {
const job = queue.create('search', { share, service })
const job = queue.create('search', { title: `Matching ${share.name} on ${service.id}`, share, service })
.attempts(3)
.backoff({ type: 'exponential' })
.save((err) => {
@ -58,7 +58,7 @@ export default function* () {
this.body = share;
} catch (e) {
debug(e);
this.throw(500, { error: { message: 'Unexpected error looking up music. Please try again later.' } });
this.throw(400, { error: { message: 'Unexpected error looking up music. Please try again later.' } });
throw e;
}
}

2
routes/share.js
View file

@ -38,7 +38,7 @@ export default function* (serviceId, type, itemId, format) {
services.forEach((service) => {
if (service.id !== share.service) {
const job = queue.create('search', { share, service })
const job = queue.create('search', { title: `Matching ${share.name} on ${service.id}`, share, service })
.attempts(3)
.backoff({ type: 'exponential' })
.save((err) => {