Mirrors/Radarr
1
0
Fork 0
mirror of https://github.com/Radarr/Radarr.git synced 2024-09-11 12:02:35 +02:00
Code Issues Releases Wiki Activity

Fixed: Treat redirects as errors in Radarr Import List

Browse Source 
(cherry picked from commit 059a156f4a34c6b9cbe139fa1973b814e8a534ae)
This commit is contained in:
Bogdan 2023-06-04 16:28:57 +03:00
parent d56f3ec2e7
commit 1b3701371a
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/NzbDrone.Core/ImportLists/Radarr/RadarrV3Proxy.cs
View File

@ -63,6 +63,12 @@ public ValidationFailure Test(RadarrSettings settings)
return new ValidationFailure("ApiKey", "API Key is invalid");
}
if (ex.Response.HasHttpRedirect)
{
_logger.Error(ex, "Radarr returned redirect and is invalid");
return new ValidationFailure("BaseUrl", "Radarr URL is invalid, are you missing a URL base?");
}
_logger.Error(ex, "Unable to connect to import list.");
return new ValidationFailure(string.Empty, $"Unable to connect to import list: {ex.Message}. Check the log surrounding this error for details.");
}
@ -84,11 +90,18 @@ private List<TResource> Execute<TResource>(string resource, RadarrSettings setti
var baseUrl = settings.BaseUrl.TrimEnd('/');
var request = new HttpRequestBuilder(baseUrl).Resource(resource).Accept(HttpAccept.Json)
.SetHeader("X-Api-Key", settings.ApiKey).Build();
var request = new HttpRequestBuilder(baseUrl).Resource(resource)
.Accept(HttpAccept.Json)
.SetHeader("X-Api-Key", settings.ApiKey)
.Build();
var response = _httpClient.Get(request);
if ((int)response.StatusCode >= 300)
{
throw new HttpException(response);
}
var results = JsonConvert.DeserializeObject<List<TResource>>(response.Content);
return results;