From ec38923701bbfcdfe77f6dbb7f878655a3e1eb02 Mon Sep 17 00:00:00 2001 From: RemixDev Date: Fri, 24 Jul 2020 11:28:42 +0200 Subject: [PATCH] Added better workaround for #2 --- deemix/__init__.py | 2 +- deemix/app/downloader.py | 14 ++++++++------ setup.py | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/deemix/__init__.py b/deemix/__init__.py index 5f8ff9e..692be14 100644 --- a/deemix/__init__.py +++ b/deemix/__init__.py @@ -1,3 +1,3 @@ #!/usr/bin/env python3 -__version__ = "1.1.17" +__version__ = "1.1.19" diff --git a/deemix/app/downloader.py b/deemix/app/downloader.py index deda84d..ca07d8c 100644 --- a/deemix/app/downloader.py +++ b/deemix/app/downloader.py @@ -288,10 +288,11 @@ def getTrackData(dz, trackAPI_gw, settings, trackAPI=None, albumAPI_gw=None, alb track['album']['artists'] = [] for artist in albumAPI['contributors']: if artist['id'] != 5080 or artist['id'] == 5080 and settings['albumVariousArtists']: - track['album']['artists'].append(artist['name']) - if not artist['role'] in track['album']['artist']: - track['album']['artist'][artist['role']] = [] + if artist['name'] not in track['album']['artists']: + track['album']['artists'].append(artist['name']) if artist['role'] != "Main" and artist['name'] not in track['album']['artist']['Main'] or artist['role'] == "Main": + if not artist['role'] in track['album']['artist']: + track['album']['artist'][artist['role']] = [] track['album']['artist'][artist['role']].append(artist['name']) if settings['removeDuplicateArtists']: track['album']['artists'] = uniqueArray(track['album']['artists']) @@ -363,10 +364,11 @@ def getTrackData(dz, trackAPI_gw, settings, trackAPI=None, albumAPI_gw=None, alb track['artists'] = [] for artist in trackAPI['contributors']: if artist['id'] != 5080 or artist['id'] == 5080 and len(trackAPI['contributors']) == 1: - track['artists'].append(artist['name']) - if not artist['role'] in track['artist']: - track['artist'][artist['role']] = [] + if artist['name'] not in track['artists']: + track['artists'].append(artist['name']) if artist['role'] != "Main" and artist['name'] not in track['artist']['Main'] or artist['role'] == "Main": + if not artist['role'] in track['artist']: + track['artist'][artist['role']] = [] track['artist'][artist['role']].append(artist['name']) if settings['removeDuplicateArtists']: track['artists'] = uniqueArray(track['artists']) diff --git a/setup.py b/setup.py index 25eeea8..d9a89fd 100644 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ README = (HERE / "README.md").read_text() setup( name="deemix", - version="1.1.17", + version="1.1.19", description="A barebone deezer downloader library", long_description=README, long_description_content_type="text/markdown",