mirror/bazarr
1
0
Fork 0
mirror of https://github.com/morpheus65535/bazarr synced 2024-12-26 01:27:07 +00:00
Code Issues Releases Wiki Activity

Fixed some incompatible calls with Radarr v4 API

Browse source
This commit is contained in:
morpheus65535 2021-06-01 21:51:25 -04:00
parent bc3f3d4934
commit a2ec23bf44
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
bazarr/utils.py
View file

@ -279,8 +279,13 @@ def get_radarr_version():
if settings.general.getboolean('use_radarr'): if settings.general.getboolean('use_radarr'):
try: try:
rv = url_radarr() + "/api/system/status?apikey=" + settings.radarr.apikey rv = url_radarr() + "/api/system/status?apikey=" + settings.radarr.apikey
radarr_version = requests.get(rv, timeout=60, verify=False, headers=headers).json()['version'] radarr_json = requests.get(rv, timeout=60, verify=False, headers=headers).json()
except Exception: if 'version' in radarr_json:
radarr_version = 'unknown'
else:
rv = url_radarr() + "/api/v3/system/status?apikey=" + settings.radarr.apikey
radarr_version = requests.get(rv, timeout=60, verify=False, headers=headers).json()['version']
except Exception as e:
logging.debug('BAZARR cannot get Radarr version') logging.debug('BAZARR cannot get Radarr version')
radarr_version = 'unknown' radarr_version = 'unknown'
return radarr_version return radarr_version
@ -290,7 +295,10 @@ def get_radarr_platform():
radarr_platform = '' radarr_platform = ''
if settings.general.getboolean('use_radarr'): if settings.general.getboolean('use_radarr'):
try: try:
rv = url_radarr() + "/api/system/status?apikey=" + settings.radarr.apikey if get_radarr_version().startswith('0'):
rv = url_radarr() + "/api/system/status?apikey=" + settings.radarr.apikey
else:
rv = url_radarr() + "/api/v3/system/status?apikey=" + settings.radarr.apikey
response = requests.get(rv, timeout=60, verify=False, headers=headers).json() response = requests.get(rv, timeout=60, verify=False, headers=headers).json()
if response['isLinux'] or response['isOsx']: if response['isLinux'] or response['isOsx']:
radarr_platform = 'posix' radarr_platform = 'posix'
@ -303,7 +311,10 @@ def get_radarr_platform():
def notify_radarr(radarr_id): def notify_radarr(radarr_id):
try: try:
url = url_radarr() + "/api/command?apikey=" + settings.radarr.apikey if get_radarr_version().startswith('0'):
url = url_radarr() + "/api/command?apikey=" + settings.radarr.apikey
else:
url = url_radarr() + "/api/v3/command?apikey=" + settings.radarr.apikey
data = { data = {
'name': 'RescanMovie', 'name': 'RescanMovie',
'movieId': int(radarr_id) 'movieId': int(radarr_id)