From 16c7ee5d51531b90612254a86dfd102dada1350b Mon Sep 17 00:00:00 2001 From: Leon Bohmann Date: Tue, 30 Nov 2021 21:41:33 +0100 Subject: [PATCH] removed exception handling from track --- zspotify/track.py | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/zspotify/track.py b/zspotify/track.py index 1deed40..6ebbf28 100644 --- a/zspotify/track.py +++ b/zspotify/track.py @@ -44,27 +44,20 @@ def get_song_info(song_id) -> Tuple[List[str], List[str], str, str, Any, Any, An try: artists = [] genres = [] - genreRetrieved = False for data in info[TRACKS][0][ARTISTS]: artists.append(data[NAME]) - try: - if not genreRetrieved: - # query artist genres via href, which will be the api url - (raw, artistInfo) = ZSpotify.invoke_url(f'{data["href"]}') - if ZSpotify.CONFIG.get_allGenres() and len(artistInfo[GENRES]) > 0: - genreRetrieved = False - for genre in artistInfo[GENRES]: - genres.append(genre) - elif len(artistInfo[GENRES]) > 0: - genres.append(artistInfo[GENRES][0]) - genreRetrieved = True - else: - genres.append('') - genreRetrieved = True - except Exception as genreError: - if len(genres) == 0: - genres.append('') - + # query artist genres via href, which will be the api url + (raw, artistInfo) = ZSpotify.invoke_url(f'{data["href"]}') + if ZSpotify.CONFIG.get_allGenres() and len(artistInfo[GENRES]) > 0: + for genre in artistInfo[GENRES]: + genres.append(genre) + elif len(artistInfo[GENRES]) > 0: + genres.append(artistInfo[GENRES][0]) + + if len(genres) == 0: + Printer.print(PrintChannel.SKIPS, "No Genre found.") + genres.append('') + album_name = info[TRACKS][0][ALBUM][NAME] name = info[TRACKS][0][NAME] image_url = info[TRACKS][0][ALBUM][IMAGES][0][URL]