From 978f9aededfee8b9680c1249d0c531194c8ccf8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Louis=20V=C3=A9zina?= <5130500+morpheus65535@users.noreply.github.com> Date: Sun, 8 Mar 2020 18:07:10 -0400 Subject: [PATCH] Fix for #851 --- bazarr/get_movies.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/bazarr/get_movies.py b/bazarr/get_movies.py index 8a8837d4f..e4f545c29 100644 --- a/bazarr/get_movies.py +++ b/bazarr/get_movies.py @@ -25,6 +25,8 @@ def update_all_movies(): def update_movies(): logging.debug('BAZARR Starting movie sync from Radarr.') apikey_radarr = settings.radarr.apikey + + radarr_version = get_radarr_version() movie_default_enabled = settings.general.getboolean('movie_default_enabled') movie_default_language = settings.general.movie_default_language movie_default_hi = settings.general.movie_default_hi @@ -130,6 +132,8 @@ def update_movies(): videoCodec = None audioCodec = None + audio_language = profile_id_to_language(movie['qualityProfileId'], audio_profiles) + # Add movies in radarr to current movies list current_movies_radarr.append(six.text_type(movie['tmdbId'])) @@ -140,7 +144,7 @@ def update_movies(): 'tmdbId': six.text_type(movie["tmdbId"]), 'poster': poster, 'fanart': fanart, - 'audio_language': profile_id_to_language(movie['qualityProfileId'], audio_profiles), + 'audio_language': audio_language, 'sceneName': sceneName, 'monitored': six.text_type(bool(movie['monitored'])), 'year': six.text_type(movie['year']), @@ -165,7 +169,7 @@ def update_movies(): 'overview': overview, 'poster': poster, 'fanart': fanart, - 'audio_language': profile_id_to_language(movie['qualityProfileId'], audio_profiles), + 'audio_language': audio_language, 'sceneName': sceneName, 'monitored': six.text_type(bool(movie['monitored'])), 'sortTitle': movie['sortTitle'], @@ -189,7 +193,7 @@ def update_movies(): 'overview': overview, 'poster': poster, 'fanart': fanart, - 'audio_language': profile_id_to_language(movie['qualityProfileId'], audio_profiles), + 'audio_language': audio_language, 'sceneName': sceneName, 'monitored': six.text_type(bool(movie['monitored'])), 'sortTitle': movie['sortTitle'], @@ -275,8 +279,11 @@ def get_profile_list(): radarr_version = get_radarr_version() profiles_list = [] # Get profiles data from radarr + if radarr_version.startswith('0'): + url_radarr_api_movies = url_radarr() + "/api/profile?apikey=" + apikey_radarr + else: + url_radarr_api_movies = url_radarr() + "/api/v3/qualityprofile?apikey=" + apikey_radarr - url_radarr_api_movies = url_radarr() + "/api/profile?apikey=" + apikey_radarr try: profiles_json = requests.get(url_radarr_api_movies, timeout=60, verify=False) except requests.exceptions.ConnectionError as errc: @@ -290,7 +297,7 @@ def get_profile_list(): if radarr_version.startswith('0'): for profile in profiles_json.json(): profiles_list.append([profile['id'], profile['language'].capitalize()]) - elif radarr_version.startswith('2'): + else: for profile in profiles_json.json(): profiles_list.append([profile['id'], profile['language']['name'].capitalize()])