Definidos jobs basicos y comunicacion con estos

This commit is contained in:
Daniel Cortes
2020-06-08 16:56:14 -04:00
parent 90c34dada3
commit ac58e29c75
2 changed files with 136 additions and 31 deletions

View File

@@ -99,7 +99,6 @@ def map_disc(mb_disc, cover_art=None):
'first_release_date': mb_disc.get('first_release_date'),
'primary_type': mb_disc.get('primary_type'),
'cover_art': cover_art,
'artist': [map_artist_credit(c) for c in mb_disc.get('artist_credit')]
}
if len(mb_disc.get('secondary_types', [])) > 0:
@@ -118,7 +117,6 @@ def map_release(mb_release, cover_art=None):
'country': mb_release.get('country'),
'date': mb_release.get('date'),
'cover_art': cover_art,
'artist': [map_artist_credit(c) for c in mb_release.get('artist_credit')]
}
@@ -129,7 +127,6 @@ def map_recording(mb_recording):
'title': mb_recording.get('title'),
'disambiguation': mb_recording.get('disambiguation'),
'length': mb_recording.get('length'),
'artist': [map_artist_credit(c) for c in mb_recording.get('artist_credit')]
}
@@ -170,13 +167,19 @@ def get_artist(mbid):
def get_disc(mbid):
"""Obtiene un disco desde musicbrainz incluyendo sus artistas"""
mb_disc = mb.get_release_group_by_mbid(mbid, includes=['artists'])
"""Obtiene un disco desde musicbrainz"""
mb_disc = cache.get(f'release_group_{mbid}')
if mb_disc is None:
mb_disc = mb.get_release_group_by_mbid(mbid)
else:
mb_disc = json.loads(mb_disc)
if 'error' in mb_disc:
return mb_disc
return map_disc(mb_disc)
jobs.load_entities_of_release_group.delay(mbid)
disc = map_disc(mb_disc)
return disc
def get_discs_of_artist(mbid, limit, page):
@@ -212,12 +215,18 @@ def get_artist_of_disc(mbid, limit, page):
def get_release(mbid):
"""Obtiene una release desde musicbrainz incluyendo sus artistas"""
mb_release = mb.get_release_by_mbid(mbid, includes=['artists'])
mb_release = cache.get(f'release_{mbid}')
if mb_release is None:
mb_release = mb.get_release_by_mbid(mbid, includes=['artists'])
else:
mb_release = json.loads(mb_release)
if 'error' in mb_release:
return mb_release
return map_release(mb_release)
jobs.load_entities_of_release.delay(mbid)
release = map_release(mb_release)
return release
def get_releases_of_disc(mbid, limit, page):
@@ -253,13 +262,19 @@ def get_artist_of_release(mbid, limit, page):
def get_recording(mbid):
"""Obtiene una grabacion incluyendo a su artista"""
mb_recording = mb.get_recording_by_mbid(mbid, includes=['artists'])
"""Obtiene una grabación incluyendo a su artista"""
mb_recording = mb.get_recording_by_mbid(mbid)
if mb_recording is None:
mb_recording = mb.get_recording_by_mbid(mbid)
else:
mb_recording = json.loads(mb_recording)
if 'error' in mb_recording:
return mb_recording
return map_recording(mb_recording)
jobs.load_entities_of_recording.delay(mb_recording)
recording = map_recording(mb_recording)
return recording
def get_recordings_of_release(mbid, limit, page):
@@ -311,28 +326,36 @@ def get_artist_of_recording(mbid, limit, page):
def get_cover_art_disc(mbid):
"""Obtiene el cover art de un disco"""
mb_covers = mb.get_release_group_cover_art(mbid)
mb_covers = cache.get(f'release_group_cover_art_{mbid}')
if mb_covers is None:
mb_covers = mb.get_release_group_cover_art(mbid)
else:
mb_covers = json.load(mb_covers)
if 'error' in mb_covers:
return None
if len(mb_covers.get('images', [])) == 1:
return map_coverart(mb_covers.get('images')[0])
jobs.load_entities_of_release_group.delay(mbid)
cover_art = map_coverart(find_best_cover(mb_covers))
return map_coverart(find_best_cover(mb_covers))
return cover_art
def get_cover_art_release(mbid):
"""Obtiene el cover art de una release"""
mb_covers = mb.get_release_cover_art(mbid)
if mb_covers is None:
mb_covers = mb.get_release_cover_art(mbid)
else:
mb_covers = json.loads(mb_covers)
if 'error' in mb_covers:
return None
if len(mb_covers.get('images', [])) == 1:
return map_coverart(mb_covers.get('images')[0])
jobs.load_entities_of_release.delay(mbid)
cover_art = map_coverart(find_best_cover(mb_covers))
return map_coverart(find_best_cover(mb_covers))
return cover_art
def get_cover_art_recording(mbid):