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

Fix Deezer covers

Browse source
This commit is contained in:
Jonathan Cremin 2017-11-11 20:55:09 +00:00
parent 2c7e4f9dee
commit 2245428465
2 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Makefile
View file

@ -11,6 +11,10 @@ help:
.PHONY: start .PHONY: start
start: docker-compose-up watch-frontend ## Start containers and watch frontend start: docker-compose-up watch-frontend ## Start containers and watch frontend
.PHONY: test
test: ## Run tests
docker-compose run --rm app yarn test
.PHONY: logs .PHONY: logs
logs: ## Tail the app and worker logs logs: ## Tail the app and worker logs
docker-compose logs -f app worker docker-compose logs -f app worker
@ -23,7 +27,6 @@ migrate: ## Migrate database schema
watch-frontend: ## Build and watch frontend for changes watch-frontend: ## Build and watch frontend for changes
docker-compose run --rm app yarn watch-js docker-compose run --rm app yarn watch-js
.PHONY: docker-compose-up .PHONY: docker-compose-up
docker-compose-up: ## Start (and create) docker containers docker-compose-up: ## Start (and create) docker containers
docker-compose up -d docker-compose up -d

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

@ -1,8 +1,11 @@
import { parse } from 'url'; import { parse } from 'url';
import request from 'superagent'; import request from 'superagent';
import 'superagent-bluebird-promise'; import 'superagent-bluebird-promise';
import debuglog from 'debug';
import urlMatch from './url'; import urlMatch from './url';
const debug = debuglog('combine.fm:deezer');
const apiRoot = 'https://api.deezer.com'; const apiRoot = 'https://api.deezer.com';
export function parseUrl(url) { export function parseUrl(url) {
@ -44,7 +47,7 @@ function looseMatch(needle, haystack, type, various) {
export function* lookupId(id, type) { export function* lookupId(id, type) {
const path = `/${type}/${id}`; const path = `/${type}/${id}?size=xl`;
const { body } = yield request.get(apiRoot + path).promise(); const { body } = yield request.get(apiRoot + path).promise();
if (!body || body.error) { if (!body || body.error) {
@ -53,18 +56,12 @@ export function* lookupId(id, type) {
return Promise.reject(error); return Promise.reject(error);
} }
const item = body; 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) {
cover = err.originalError.response;
}
const artwork = { const artwork = {
small: cover.headers.location.replace('120x120', '200x200'), small: item.cover_medium || item.artist.picture_medium,
large: cover.headers.location.replace('120x120', '800x800'), large: item.cover_xl || item.artist.picture_xl,
}; };
if (type === 'album') { if (type === 'album') {
return Promise.resolve({ return Promise.resolve({
service: 'deezer', service: 'deezer',