New: Improve applications error reporting for requests (#1618)

Co-authored-by: Bogdan <mynameisbogdan@users.noreply.github.com>
pull/1619/head
bakerboy448 1 year ago committed by GitHub
parent bc8ba5ca02
commit 65d6d518d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -23,6 +23,8 @@ namespace NzbDrone.Core.Applications.Lidarr
public class LidarrV1Proxy : ILidarrV1Proxy public class LidarrV1Proxy : ILidarrV1Proxy
{ {
private const string AppApiRoute = "/api/v1";
private const string AppIndexerApiRoute = $"{AppApiRoute}/indexer";
private readonly IHttpClient _httpClient; private readonly IHttpClient _httpClient;
private readonly Logger _logger; private readonly Logger _logger;
@ -34,13 +36,13 @@ namespace NzbDrone.Core.Applications.Lidarr
public LidarrStatus GetStatus(LidarrSettings settings) public LidarrStatus GetStatus(LidarrSettings settings)
{ {
var request = BuildRequest(settings, "/api/v1/system/status", HttpMethod.Get); var request = BuildRequest(settings, $"{AppApiRoute}/system/status", HttpMethod.Get);
return Execute<LidarrStatus>(request); return Execute<LidarrStatus>(request);
} }
public List<LidarrIndexer> GetIndexers(LidarrSettings settings) public List<LidarrIndexer> GetIndexers(LidarrSettings settings)
{ {
var request = BuildRequest(settings, "/api/v1/indexer", HttpMethod.Get); var request = BuildRequest(settings, $"{AppIndexerApiRoute}", HttpMethod.Get);
return Execute<List<LidarrIndexer>>(request); return Execute<List<LidarrIndexer>>(request);
} }
@ -48,7 +50,7 @@ namespace NzbDrone.Core.Applications.Lidarr
{ {
try try
{ {
var request = BuildRequest(settings, $"/api/v1/indexer/{indexerId}", HttpMethod.Get); var request = BuildRequest(settings, $"{AppIndexerApiRoute}/{indexerId}", HttpMethod.Get);
return Execute<LidarrIndexer>(request); return Execute<LidarrIndexer>(request);
} }
catch (HttpException ex) catch (HttpException ex)
@ -64,37 +66,37 @@ namespace NzbDrone.Core.Applications.Lidarr
public void RemoveIndexer(int indexerId, LidarrSettings settings) public void RemoveIndexer(int indexerId, LidarrSettings settings)
{ {
var request = BuildRequest(settings, $"/api/v1/indexer/{indexerId}", HttpMethod.Delete); var request = BuildRequest(settings, $"{AppIndexerApiRoute}/{indexerId}", HttpMethod.Delete);
_httpClient.Execute(request); _httpClient.Execute(request);
} }
public List<LidarrIndexer> GetIndexerSchema(LidarrSettings settings) public List<LidarrIndexer> GetIndexerSchema(LidarrSettings settings)
{ {
var request = BuildRequest(settings, "/api/v1/indexer/schema", HttpMethod.Get); var request = BuildRequest(settings, $"{AppIndexerApiRoute}/schema", HttpMethod.Get);
return Execute<List<LidarrIndexer>>(request); return Execute<List<LidarrIndexer>>(request);
} }
public LidarrIndexer AddIndexer(LidarrIndexer indexer, LidarrSettings settings) public LidarrIndexer AddIndexer(LidarrIndexer indexer, LidarrSettings settings)
{ {
var request = BuildRequest(settings, "/api/v1/indexer", HttpMethod.Post); var request = BuildRequest(settings, $"{AppIndexerApiRoute}", HttpMethod.Post);
request.SetContent(indexer.ToJson()); request.SetContent(indexer.ToJson());
return Execute<LidarrIndexer>(request); return ExecuteIndexerRequest(request);
} }
public LidarrIndexer UpdateIndexer(LidarrIndexer indexer, LidarrSettings settings) public LidarrIndexer UpdateIndexer(LidarrIndexer indexer, LidarrSettings settings)
{ {
var request = BuildRequest(settings, $"/api/v1/indexer/{indexer.Id}", HttpMethod.Put); var request = BuildRequest(settings, $"{AppIndexerApiRoute}/{indexer.Id}", HttpMethod.Put);
request.SetContent(indexer.ToJson()); request.SetContent(indexer.ToJson());
return Execute<LidarrIndexer>(request); return ExecuteIndexerRequest(request);
} }
public ValidationFailure TestConnection(LidarrIndexer indexer, LidarrSettings settings) public ValidationFailure TestConnection(LidarrIndexer indexer, LidarrSettings settings)
{ {
var request = BuildRequest(settings, $"/api/v1/indexer/test", HttpMethod.Post); var request = BuildRequest(settings, $"{AppIndexerApiRoute}/test", HttpMethod.Post);
request.SetContent(indexer.ToJson()); request.SetContent(indexer.ToJson());
@ -134,6 +136,53 @@ namespace NzbDrone.Core.Applications.Lidarr
return null; return null;
} }
private LidarrIndexer ExecuteIndexerRequest(HttpRequest request)
{
try
{
return Execute<LidarrIndexer>(request);
}
catch (HttpException ex)
{
switch (ex.Response.StatusCode)
{
case HttpStatusCode.Unauthorized:
_logger.Error(ex, "API Key is invalid");
break;
case HttpStatusCode.BadRequest:
if (ex.Response.Content.Contains("Query successful, but no results in the configured categories were returned from your indexer.", StringComparison.InvariantCultureIgnoreCase))
{
_logger.Error(ex, "No Results in configured categories. See FAQ Entry: Prowlarr will not sync X Indexer to App");
break;
}
_logger.Error(ex, "Invalid Request");
break;
case HttpStatusCode.SeeOther:
_logger.Error(ex, "App returned redirect and is invalid. Check App URL");
break;
case HttpStatusCode.NotFound:
_logger.Error(ex, "Remote indexer not found");
break;
default:
_logger.Error(ex, "Unexpected response status code: {0}", ex.Response.StatusCode);
throw;
}
}
catch (JsonReaderException ex)
{
_logger.Error(ex, "Unable to parse JSON response from application");
throw;
}
catch (Exception ex)
{
_logger.Error(ex, "Unable to add or update indexer");
throw;
}
return null;
}
private HttpRequest BuildRequest(LidarrSettings settings, string resource, HttpMethod method) private HttpRequest BuildRequest(LidarrSettings settings, string resource, HttpMethod method)
{ {
var baseUrl = settings.BaseUrl.TrimEnd('/'); var baseUrl = settings.BaseUrl.TrimEnd('/');

@ -23,6 +23,8 @@ namespace NzbDrone.Core.Applications.Radarr
public class RadarrV3Proxy : IRadarrV3Proxy public class RadarrV3Proxy : IRadarrV3Proxy
{ {
private const string AppApiRoute = "/api/v3";
private const string AppIndexerApiRoute = $"{AppApiRoute}/indexer";
private readonly IHttpClient _httpClient; private readonly IHttpClient _httpClient;
private readonly Logger _logger; private readonly Logger _logger;
@ -34,13 +36,13 @@ namespace NzbDrone.Core.Applications.Radarr
public RadarrStatus GetStatus(RadarrSettings settings) public RadarrStatus GetStatus(RadarrSettings settings)
{ {
var request = BuildRequest(settings, "/api/v3/system/status", HttpMethod.Get); var request = BuildRequest(settings, $"{AppApiRoute}/system/status", HttpMethod.Get);
return Execute<RadarrStatus>(request); return Execute<RadarrStatus>(request);
} }
public List<RadarrIndexer> GetIndexers(RadarrSettings settings) public List<RadarrIndexer> GetIndexers(RadarrSettings settings)
{ {
var request = BuildRequest(settings, "/api/v3/indexer", HttpMethod.Get); var request = BuildRequest(settings, $"{AppIndexerApiRoute}", HttpMethod.Get);
return Execute<List<RadarrIndexer>>(request); return Execute<List<RadarrIndexer>>(request);
} }
@ -48,7 +50,7 @@ namespace NzbDrone.Core.Applications.Radarr
{ {
try try
{ {
var request = BuildRequest(settings, $"/api/v3/indexer/{indexerId}", HttpMethod.Get); var request = BuildRequest(settings, $"{AppIndexerApiRoute}/{indexerId}", HttpMethod.Get);
return Execute<RadarrIndexer>(request); return Execute<RadarrIndexer>(request);
} }
catch (HttpException ex) catch (HttpException ex)
@ -64,37 +66,37 @@ namespace NzbDrone.Core.Applications.Radarr
public void RemoveIndexer(int indexerId, RadarrSettings settings) public void RemoveIndexer(int indexerId, RadarrSettings settings)
{ {
var request = BuildRequest(settings, $"/api/v3/indexer/{indexerId}", HttpMethod.Delete); var request = BuildRequest(settings, $"{AppIndexerApiRoute}/{indexerId}", HttpMethod.Delete);
_httpClient.Execute(request); _httpClient.Execute(request);
} }
public List<RadarrIndexer> GetIndexerSchema(RadarrSettings settings) public List<RadarrIndexer> GetIndexerSchema(RadarrSettings settings)
{ {
var request = BuildRequest(settings, "/api/v3/indexer/schema", HttpMethod.Get); var request = BuildRequest(settings, $"{AppIndexerApiRoute}/schema", HttpMethod.Get);
return Execute<List<RadarrIndexer>>(request); return Execute<List<RadarrIndexer>>(request);
} }
public RadarrIndexer AddIndexer(RadarrIndexer indexer, RadarrSettings settings) public RadarrIndexer AddIndexer(RadarrIndexer indexer, RadarrSettings settings)
{ {
var request = BuildRequest(settings, "/api/v3/indexer", HttpMethod.Post); var request = BuildRequest(settings, $"{AppIndexerApiRoute}", HttpMethod.Post);
request.SetContent(indexer.ToJson()); request.SetContent(indexer.ToJson());
return Execute<RadarrIndexer>(request); return ExecuteIndexerRequest(request);
} }
public RadarrIndexer UpdateIndexer(RadarrIndexer indexer, RadarrSettings settings) public RadarrIndexer UpdateIndexer(RadarrIndexer indexer, RadarrSettings settings)
{ {
var request = BuildRequest(settings, $"/api/v3/indexer/{indexer.Id}", HttpMethod.Put); var request = BuildRequest(settings, $"{AppIndexerApiRoute}/{indexer.Id}", HttpMethod.Put);
request.SetContent(indexer.ToJson()); request.SetContent(indexer.ToJson());
return Execute<RadarrIndexer>(request); return ExecuteIndexerRequest(request);
} }
public ValidationFailure TestConnection(RadarrIndexer indexer, RadarrSettings settings) public ValidationFailure TestConnection(RadarrIndexer indexer, RadarrSettings settings)
{ {
var request = BuildRequest(settings, $"/api/v3/indexer/test", HttpMethod.Post); var request = BuildRequest(settings, $"{AppIndexerApiRoute}/test", HttpMethod.Post);
request.SetContent(indexer.ToJson()); request.SetContent(indexer.ToJson());
@ -134,6 +136,53 @@ namespace NzbDrone.Core.Applications.Radarr
return null; return null;
} }
private RadarrIndexer ExecuteIndexerRequest(HttpRequest request)
{
try
{
return Execute<RadarrIndexer>(request);
}
catch (HttpException ex)
{
switch (ex.Response.StatusCode)
{
case HttpStatusCode.Unauthorized:
_logger.Error(ex, "API Key is invalid");
break;
case HttpStatusCode.BadRequest:
if (ex.Response.Content.Contains("Query successful, but no results in the configured categories were returned from your indexer.", StringComparison.InvariantCultureIgnoreCase))
{
_logger.Error(ex, "No Results in configured categories. See FAQ Entry: Prowlarr will not sync X Indexer to App");
break;
}
_logger.Error(ex, "Invalid Request");
break;
case HttpStatusCode.SeeOther:
_logger.Error(ex, "App returned redirect and is invalid. Check App URL");
break;
case HttpStatusCode.NotFound:
_logger.Error(ex, "Remote indexer not found");
break;
default:
_logger.Error(ex, "Unexpected response status code: {0}", ex.Response.StatusCode);
throw;
}
}
catch (JsonReaderException ex)
{
_logger.Error(ex, "Unable to parse JSON response from application");
throw;
}
catch (Exception ex)
{
_logger.Error(ex, "Unable to add or update indexer");
throw;
}
return null;
}
private HttpRequest BuildRequest(RadarrSettings settings, string resource, HttpMethod method) private HttpRequest BuildRequest(RadarrSettings settings, string resource, HttpMethod method)
{ {
var baseUrl = settings.BaseUrl.TrimEnd('/'); var baseUrl = settings.BaseUrl.TrimEnd('/');

@ -23,6 +23,8 @@ namespace NzbDrone.Core.Applications.Readarr
public class ReadarrV1Proxy : IReadarrV1Proxy public class ReadarrV1Proxy : IReadarrV1Proxy
{ {
private const string AppApiRoute = "/api/v1";
private const string AppIndexerApiRoute = $"{AppApiRoute}/indexer";
private readonly IHttpClient _httpClient; private readonly IHttpClient _httpClient;
private readonly Logger _logger; private readonly Logger _logger;
@ -34,13 +36,13 @@ namespace NzbDrone.Core.Applications.Readarr
public ReadarrStatus GetStatus(ReadarrSettings settings) public ReadarrStatus GetStatus(ReadarrSettings settings)
{ {
var request = BuildRequest(settings, "/api/v1/system/status", HttpMethod.Get); var request = BuildRequest(settings, $"{AppApiRoute}/system/status", HttpMethod.Get);
return Execute<ReadarrStatus>(request); return Execute<ReadarrStatus>(request);
} }
public List<ReadarrIndexer> GetIndexers(ReadarrSettings settings) public List<ReadarrIndexer> GetIndexers(ReadarrSettings settings)
{ {
var request = BuildRequest(settings, "/api/v1/indexer", HttpMethod.Get); var request = BuildRequest(settings, $"{AppIndexerApiRoute}", HttpMethod.Get);
return Execute<List<ReadarrIndexer>>(request); return Execute<List<ReadarrIndexer>>(request);
} }
@ -48,7 +50,7 @@ namespace NzbDrone.Core.Applications.Readarr
{ {
try try
{ {
var request = BuildRequest(settings, $"/api/v1/indexer/{indexerId}", HttpMethod.Get); var request = BuildRequest(settings, $"{AppIndexerApiRoute}/{indexerId}", HttpMethod.Get);
return Execute<ReadarrIndexer>(request); return Execute<ReadarrIndexer>(request);
} }
catch (HttpException ex) catch (HttpException ex)
@ -64,37 +66,37 @@ namespace NzbDrone.Core.Applications.Readarr
public void RemoveIndexer(int indexerId, ReadarrSettings settings) public void RemoveIndexer(int indexerId, ReadarrSettings settings)
{ {
var request = BuildRequest(settings, $"/api/v1/indexer/{indexerId}", HttpMethod.Delete); var request = BuildRequest(settings, $"{AppIndexerApiRoute}/{indexerId}", HttpMethod.Delete);
_httpClient.Execute(request); _httpClient.Execute(request);
} }
public List<ReadarrIndexer> GetIndexerSchema(ReadarrSettings settings) public List<ReadarrIndexer> GetIndexerSchema(ReadarrSettings settings)
{ {
var request = BuildRequest(settings, "/api/v1/indexer/schema", HttpMethod.Get); var request = BuildRequest(settings, $"{AppIndexerApiRoute}/schema", HttpMethod.Get);
return Execute<List<ReadarrIndexer>>(request); return Execute<List<ReadarrIndexer>>(request);
} }
public ReadarrIndexer AddIndexer(ReadarrIndexer indexer, ReadarrSettings settings) public ReadarrIndexer AddIndexer(ReadarrIndexer indexer, ReadarrSettings settings)
{ {
var request = BuildRequest(settings, "/api/v1/indexer", HttpMethod.Post); var request = BuildRequest(settings, $"{AppIndexerApiRoute}", HttpMethod.Post);
request.SetContent(indexer.ToJson()); request.SetContent(indexer.ToJson());
return Execute<ReadarrIndexer>(request); return ExecuteIndexerRequest(request);
} }
public ReadarrIndexer UpdateIndexer(ReadarrIndexer indexer, ReadarrSettings settings) public ReadarrIndexer UpdateIndexer(ReadarrIndexer indexer, ReadarrSettings settings)
{ {
var request = BuildRequest(settings, $"/api/v1/indexer/{indexer.Id}", HttpMethod.Put); var request = BuildRequest(settings, $"{AppIndexerApiRoute}/{indexer.Id}", HttpMethod.Put);
request.SetContent(indexer.ToJson()); request.SetContent(indexer.ToJson());
return Execute<ReadarrIndexer>(request); return ExecuteIndexerRequest(request);
} }
public ValidationFailure TestConnection(ReadarrIndexer indexer, ReadarrSettings settings) public ValidationFailure TestConnection(ReadarrIndexer indexer, ReadarrSettings settings)
{ {
var request = BuildRequest(settings, $"/api/v1/indexer/test", HttpMethod.Post); var request = BuildRequest(settings, $"{AppIndexerApiRoute}/test", HttpMethod.Post);
request.SetContent(indexer.ToJson()); request.SetContent(indexer.ToJson());
@ -134,6 +136,53 @@ namespace NzbDrone.Core.Applications.Readarr
return null; return null;
} }
private ReadarrIndexer ExecuteIndexerRequest(HttpRequest request)
{
try
{
return Execute<ReadarrIndexer>(request);
}
catch (HttpException ex)
{
switch (ex.Response.StatusCode)
{
case HttpStatusCode.Unauthorized:
_logger.Error(ex, "API Key is invalid");
break;
case HttpStatusCode.BadRequest:
if (ex.Response.Content.Contains("Query successful, but no results in the configured categories were returned from your indexer.", StringComparison.InvariantCultureIgnoreCase))
{
_logger.Error(ex, "No Results in configured categories. See FAQ Entry: Prowlarr will not sync X Indexer to App");
break;
}
_logger.Error(ex, "Invalid Request");
break;
case HttpStatusCode.SeeOther:
_logger.Error(ex, "App returned redirect and is invalid. Check App URL");
break;
case HttpStatusCode.NotFound:
_logger.Error(ex, "Remote indexer not found");
break;
default:
_logger.Error(ex, "Unexpected response status code: {0}", ex.Response.StatusCode);
throw;
}
}
catch (JsonReaderException ex)
{
_logger.Error(ex, "Unable to parse JSON response from application");
throw;
}
catch (Exception ex)
{
_logger.Error(ex, "Unable to add or update indexer");
throw;
}
return null;
}
private HttpRequest BuildRequest(ReadarrSettings settings, string resource, HttpMethod method) private HttpRequest BuildRequest(ReadarrSettings settings, string resource, HttpMethod method)
{ {
var baseUrl = settings.BaseUrl.TrimEnd('/'); var baseUrl = settings.BaseUrl.TrimEnd('/');

@ -23,6 +23,8 @@ namespace NzbDrone.Core.Applications.Sonarr
public class SonarrV3Proxy : ISonarrV3Proxy public class SonarrV3Proxy : ISonarrV3Proxy
{ {
private const string AppApiRoute = "/api/v3";
private const string AppIndexerApiRoute = $"{AppApiRoute}/indexer";
private readonly IHttpClient _httpClient; private readonly IHttpClient _httpClient;
private readonly Logger _logger; private readonly Logger _logger;
@ -34,13 +36,13 @@ namespace NzbDrone.Core.Applications.Sonarr
public SonarrStatus GetStatus(SonarrSettings settings) public SonarrStatus GetStatus(SonarrSettings settings)
{ {
var request = BuildRequest(settings, "/api/v3/system/status", HttpMethod.Get); var request = BuildRequest(settings, $"{AppApiRoute}/system/status", HttpMethod.Get);
return Execute<SonarrStatus>(request); return Execute<SonarrStatus>(request);
} }
public List<SonarrIndexer> GetIndexers(SonarrSettings settings) public List<SonarrIndexer> GetIndexers(SonarrSettings settings)
{ {
var request = BuildRequest(settings, "/api/v3/indexer", HttpMethod.Get); var request = BuildRequest(settings, $"{AppIndexerApiRoute}", HttpMethod.Get);
return Execute<List<SonarrIndexer>>(request); return Execute<List<SonarrIndexer>>(request);
} }
@ -48,7 +50,7 @@ namespace NzbDrone.Core.Applications.Sonarr
{ {
try try
{ {
var request = BuildRequest(settings, $"/api/v3/indexer/{indexerId}", HttpMethod.Get); var request = BuildRequest(settings, $"{AppIndexerApiRoute}/{indexerId}", HttpMethod.Get);
return Execute<SonarrIndexer>(request); return Execute<SonarrIndexer>(request);
} }
catch (HttpException ex) catch (HttpException ex)
@ -64,37 +66,37 @@ namespace NzbDrone.Core.Applications.Sonarr
public void RemoveIndexer(int indexerId, SonarrSettings settings) public void RemoveIndexer(int indexerId, SonarrSettings settings)
{ {
var request = BuildRequest(settings, $"/api/v3/indexer/{indexerId}", HttpMethod.Delete); var request = BuildRequest(settings, $"{AppIndexerApiRoute}/{indexerId}", HttpMethod.Delete);
_httpClient.Execute(request); _httpClient.Execute(request);
} }
public List<SonarrIndexer> GetIndexerSchema(SonarrSettings settings) public List<SonarrIndexer> GetIndexerSchema(SonarrSettings settings)
{ {
var request = BuildRequest(settings, "/api/v3/indexer/schema", HttpMethod.Get); var request = BuildRequest(settings, $"{AppIndexerApiRoute}/schema", HttpMethod.Get);
return Execute<List<SonarrIndexer>>(request); return Execute<List<SonarrIndexer>>(request);
} }
public SonarrIndexer AddIndexer(SonarrIndexer indexer, SonarrSettings settings) public SonarrIndexer AddIndexer(SonarrIndexer indexer, SonarrSettings settings)
{ {
var request = BuildRequest(settings, "/api/v3/indexer", HttpMethod.Post); var request = BuildRequest(settings, $"{AppIndexerApiRoute}", HttpMethod.Post);
request.SetContent(indexer.ToJson()); request.SetContent(indexer.ToJson());
return Execute<SonarrIndexer>(request); return ExecuteIndexerRequest(request);
} }
public SonarrIndexer UpdateIndexer(SonarrIndexer indexer, SonarrSettings settings) public SonarrIndexer UpdateIndexer(SonarrIndexer indexer, SonarrSettings settings)
{ {
var request = BuildRequest(settings, $"/api/v3/indexer/{indexer.Id}", HttpMethod.Put); var request = BuildRequest(settings, $"{AppIndexerApiRoute}/{indexer.Id}", HttpMethod.Put);
request.SetContent(indexer.ToJson()); request.SetContent(indexer.ToJson());
return Execute<SonarrIndexer>(request); return ExecuteIndexerRequest(request);
} }
public ValidationFailure TestConnection(SonarrIndexer indexer, SonarrSettings settings) public ValidationFailure TestConnection(SonarrIndexer indexer, SonarrSettings settings)
{ {
var request = BuildRequest(settings, $"/api/v3/indexer/test", HttpMethod.Post); var request = BuildRequest(settings, $"{AppIndexerApiRoute}/test", HttpMethod.Post);
request.SetContent(indexer.ToJson()); request.SetContent(indexer.ToJson());
@ -140,6 +142,53 @@ namespace NzbDrone.Core.Applications.Sonarr
return null; return null;
} }
private SonarrIndexer ExecuteIndexerRequest(HttpRequest request)
{
try
{
return Execute<SonarrIndexer>(request);
}
catch (HttpException ex)
{
switch (ex.Response.StatusCode)
{
case HttpStatusCode.Unauthorized:
_logger.Error(ex, "API Key is invalid");
break;
case HttpStatusCode.BadRequest:
if (ex.Response.Content.Contains("Query successful, but no results in the configured categories were returned from your indexer.", StringComparison.InvariantCultureIgnoreCase))
{
_logger.Error(ex, "No Results in configured categories. See FAQ Entry: Prowlarr will not sync X Indexer to App");
break;
}
_logger.Error(ex, "Invalid Request");
break;
case HttpStatusCode.SeeOther:
_logger.Error(ex, "App returned redirect and is invalid. Check App URL");
break;
case HttpStatusCode.NotFound:
_logger.Error(ex, "Remote indexer not found");
break;
default:
_logger.Error(ex, "Unexpected response status code: {0}", ex.Response.StatusCode);
throw;
}
}
catch (JsonReaderException ex)
{
_logger.Error(ex, "Unable to parse JSON response from application");
throw;
}
catch (Exception ex)
{
_logger.Error(ex, "Unable to add or update indexer");
throw;
}
return null;
}
private HttpRequest BuildRequest(SonarrSettings settings, string resource, HttpMethod method) private HttpRequest BuildRequest(SonarrSettings settings, string resource, HttpMethod method)
{ {
var baseUrl = settings.BaseUrl.TrimEnd('/'); var baseUrl = settings.BaseUrl.TrimEnd('/');

@ -23,6 +23,8 @@ namespace NzbDrone.Core.Applications.Whisparr
public class WhisparrV3Proxy : IWhisparrV3Proxy public class WhisparrV3Proxy : IWhisparrV3Proxy
{ {
private const string AppApiRoute = "/api/v3";
private const string AppIndexerApiRoute = $"{AppApiRoute}/indexer";
private readonly IHttpClient _httpClient; private readonly IHttpClient _httpClient;
private readonly Logger _logger; private readonly Logger _logger;
@ -34,13 +36,13 @@ namespace NzbDrone.Core.Applications.Whisparr
public WhisparrStatus GetStatus(WhisparrSettings settings) public WhisparrStatus GetStatus(WhisparrSettings settings)
{ {
var request = BuildRequest(settings, "/api/v3/system/status", HttpMethod.Get); var request = BuildRequest(settings, $"{AppApiRoute}/system/status", HttpMethod.Get);
return Execute<WhisparrStatus>(request); return Execute<WhisparrStatus>(request);
} }
public List<WhisparrIndexer> GetIndexers(WhisparrSettings settings) public List<WhisparrIndexer> GetIndexers(WhisparrSettings settings)
{ {
var request = BuildRequest(settings, "/api/v3/indexer", HttpMethod.Get); var request = BuildRequest(settings, $"{AppIndexerApiRoute}", HttpMethod.Get);
return Execute<List<WhisparrIndexer>>(request); return Execute<List<WhisparrIndexer>>(request);
} }
@ -48,7 +50,7 @@ namespace NzbDrone.Core.Applications.Whisparr
{ {
try try
{ {
var request = BuildRequest(settings, $"/api/v3/indexer/{indexerId}", HttpMethod.Get); var request = BuildRequest(settings, $"{AppIndexerApiRoute}/{indexerId}", HttpMethod.Get);
return Execute<WhisparrIndexer>(request); return Execute<WhisparrIndexer>(request);
} }
catch (HttpException ex) catch (HttpException ex)
@ -64,19 +66,19 @@ namespace NzbDrone.Core.Applications.Whisparr
public void RemoveIndexer(int indexerId, WhisparrSettings settings) public void RemoveIndexer(int indexerId, WhisparrSettings settings)
{ {
var request = BuildRequest(settings, $"/api/v3/indexer/{indexerId}", HttpMethod.Delete); var request = BuildRequest(settings, $"{AppIndexerApiRoute}/{indexerId}", HttpMethod.Delete);
_httpClient.Execute(request); _httpClient.Execute(request);
} }
public List<WhisparrIndexer> GetIndexerSchema(WhisparrSettings settings) public List<WhisparrIndexer> GetIndexerSchema(WhisparrSettings settings)
{ {
var request = BuildRequest(settings, "/api/v3/indexer/schema", HttpMethod.Get); var request = BuildRequest(settings, $"{AppIndexerApiRoute}/schema", HttpMethod.Get);
return Execute<List<WhisparrIndexer>>(request); return Execute<List<WhisparrIndexer>>(request);
} }
public WhisparrIndexer AddIndexer(WhisparrIndexer indexer, WhisparrSettings settings) public WhisparrIndexer AddIndexer(WhisparrIndexer indexer, WhisparrSettings settings)
{ {
var request = BuildRequest(settings, "/api/v3/indexer", HttpMethod.Post); var request = BuildRequest(settings, $"{AppIndexerApiRoute}", HttpMethod.Post);
request.SetContent(indexer.ToJson()); request.SetContent(indexer.ToJson());
@ -85,16 +87,16 @@ namespace NzbDrone.Core.Applications.Whisparr
public WhisparrIndexer UpdateIndexer(WhisparrIndexer indexer, WhisparrSettings settings) public WhisparrIndexer UpdateIndexer(WhisparrIndexer indexer, WhisparrSettings settings)
{ {
var request = BuildRequest(settings, $"/api/v3/indexer/{indexer.Id}", HttpMethod.Put); var request = BuildRequest(settings, $"{AppIndexerApiRoute}/{indexer.Id}", HttpMethod.Put);
request.SetContent(indexer.ToJson()); request.SetContent(indexer.ToJson());
return Execute<WhisparrIndexer>(request); return ExecuteIndexerRequest(request);
} }
public ValidationFailure TestConnection(WhisparrIndexer indexer, WhisparrSettings settings) public ValidationFailure TestConnection(WhisparrIndexer indexer, WhisparrSettings settings)
{ {
var request = BuildRequest(settings, $"/api/v3/indexer/test", HttpMethod.Post); var request = BuildRequest(settings, $"{AppIndexerApiRoute}/test", HttpMethod.Post);
request.SetContent(indexer.ToJson()); request.SetContent(indexer.ToJson());
@ -134,6 +136,53 @@ namespace NzbDrone.Core.Applications.Whisparr
return null; return null;
} }
private WhisparrIndexer ExecuteIndexerRequest(HttpRequest request)
{
try
{
return Execute<WhisparrIndexer>(request);
}
catch (HttpException ex)
{
switch (ex.Response.StatusCode)
{
case HttpStatusCode.Unauthorized:
_logger.Error(ex, "API Key is invalid");
break;
case HttpStatusCode.BadRequest:
if (ex.Response.Content.Contains("Query successful, but no results in the configured categories were returned from your indexer.", StringComparison.InvariantCultureIgnoreCase))
{
_logger.Error(ex, "No Results in configured categories. See FAQ Entry: Prowlarr will not sync X Indexer to App");
break;
}
_logger.Error(ex, "Invalid Request");
break;
case HttpStatusCode.SeeOther:
_logger.Error(ex, "App returned redirect and is invalid. Check App URL");
break;
case HttpStatusCode.NotFound:
_logger.Error(ex, "Remote indexer not found");
break;
default:
_logger.Error(ex, "Unexpected response status code: {0}", ex.Response.StatusCode);
throw;
}
}
catch (JsonReaderException ex)
{
_logger.Error(ex, "Unable to parse JSON response from application");
throw;
}
catch (Exception ex)
{
_logger.Error(ex, "Unable to add or update indexer");
throw;
}
return null;
}
private HttpRequest BuildRequest(WhisparrSettings settings, string resource, HttpMethod method) private HttpRequest BuildRequest(WhisparrSettings settings, string resource, HttpMethod method)
{ {
var baseUrl = settings.BaseUrl.TrimEnd('/'); var baseUrl = settings.BaseUrl.TrimEnd('/');

Loading…
Cancel
Save