skrd/musiclist-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cache para los cover arts

Browse Source 
Aparte hice un metodo que cambia http a https dentro de map_coverart,
porque por alguna razon cover art archive retorna sus imagenes con http
y los navegdores se quejan por esto
This commit is contained in:
Daniel Cortes
2020-06-12 06:39:04 -04:00
parent 878c85ec78
commit 788a4e3397
2 changed files with 50 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
fetcher/medium.py
View File

@@ -4,15 +4,13 @@ Su objetivo es modificar los datos que entrega musicbrainz para que sean
correspondientes con lo que debe entregar la api, se encarga de casos como
traducción.
"""
import json
import logging
from math import ceil
from country_list import countries_for_language
from fetcher import cache
import fetcher.musicbrainz as mb
from fetcher import jobs, cache
from utils import get_redis_connection
_log = logging.getLogger('fetcher_medium')
_log.addHandler(logging.NullHandler())
@@ -148,13 +146,17 @@ def map_recording(mb_recording):
def map_coverart(mb_cover):
"""Mapea el modelo de coverart entregado por musicbrainz a uno propio"""
def https(link):
if link:
return link.replace('http://', 'https://')
return {
'image': mb_cover.get('image'),
'1200': mb_cover.get('thumbnails', {}).get('1200'),
'500': mb_cover.get('thumbnails', {}).get('500'),
'250': mb_cover.get('thumbnails', {}).get('250'),
'large': mb_cover.get('thumbnails', {}).get('large'),
'small': mb_cover.get('thumbnails', {}).get('small'),
'image': https(mb_cover.get('image')),
'1200': https(mb_cover.get('thumbnails', {}).get('1200')),
'500': https(mb_cover.get('thumbnails', {}).get('500')),
'250': https(mb_cover.get('thumbnails', {}).get('250')),
'large': https(mb_cover.get('thumbnails', {}).get('large')),
'small': https(mb_cover.get('thumbnails', {}).get('small')),
}
@@ -208,7 +210,7 @@ def get_discs_of_artist(mbid, limit, page):
if mb_discs and total:
return {
'paginate': paginate(total, limit, page),
'discs': {map_disc(disc) for disc in mb_discs}
'discs': [map_disc(disc) for disc in mb_discs]
}
mb_discs_browse = mb.browse_release_groups(params={'artist': mbid},
@@ -424,49 +426,34 @@ def get_artist_of_recording(mbid):
def get_cover_art_disc(mbid):
"""Obtiene el cover art de un disco"""
with get_redis_connection() as redis:
mb_covers = redis.get(f'release_group:{mbid}:cover_art')
if mb_covers is None:
mb_covers = mb.get_release_group_cover_art(mbid)
else:
mb_covers = json.loads(mb_covers)
if 'error' in mb_covers:
return None
mb_covers = cache.get_cover_art_disc(mbid)
if mb_covers:
return map_coverart(find_best_cover(mb_covers))
jobs.load_entities_of_release_group.delay(mbid)
cover_art = map_coverart(find_best_cover(mb_covers))
mb_covers = mb.get_release_group_cover_art(mbid)
return cover_art
if 'error' in mb_covers:
_log.error('Error al cargar cover %s', mb_covers)
return None
return map_coverart(find_best_cover(mb_covers))
def get_cover_art_release(mbid):
"""Obtiene el cover art de una release"""
with get_redis_connection() as redis:
mb_covers = redis.get(f'release:{mbid}:cover_art')
if mb_covers is None:
mb_covers = mb.get_release_cover_art(mbid)
else:
mb_covers = json.loads(mb_covers)
mb_covers = cache.get_cover_art_release(mbid)
if mb_covers:
return map_coverart(find_best_cover(mb_covers))
if 'error' in mb_covers:
return None
mb_covers = mb.get_release_cover_art(mbid)
jobs.load_entities_of_release.delay(mbid)
cover_art = map_coverart(find_best_cover(mb_covers))
return cover_art
def get_cover_art_recording(mbid):
"""Obtiene el cover art de una grabacion"""
release = get_releases_of_recording(mbid, limit=1, page=1)[0]
if 'error' in release:
if 'error' in mb_covers:
_log.error('Error al cargar cover %s', mb_covers)
return None
return get_cover_art_release(release['releases'][0]['id'])
return map_coverart(find_best_cover(mb_covers))
##