diff --git a/src/NzbDrone.Core/Indexers/HttpIndexerBase.cs b/src/NzbDrone.Core/Indexers/HttpIndexerBase.cs index 13dbd98e0..5055a83b0 100644 --- a/src/NzbDrone.Core/Indexers/HttpIndexerBase.cs +++ b/src/NzbDrone.Core/Indexers/HttpIndexerBase.cs @@ -301,15 +301,15 @@ namespace NzbDrone.Core.Indexers return new ValidationFailure(string.Empty, "Query successful, but no results were returned from your indexer. This may be an issue with the indexer or your indexer category settings."); } } - catch (ApiKeyException) + catch (ApiKeyException ex) { - _logger.Warn("Indexer returned result for RSS URL, API Key appears to be invalid"); + _logger.Warn("Indexer returned result for RSS URL, API Key appears to be invalid: " + ex.Message); return new ValidationFailure("ApiKey", "Invalid API Key"); } - catch (RequestLimitReachedException) + catch (RequestLimitReachedException ex) { - _logger.Warn("Request limit reached"); + _logger.Warn("Request limit reached: " + ex.Message); } catch (CloudFlareCaptchaException ex) { diff --git a/src/NzbDrone.Core/Indexers/Newznab/NewznabCapabilitiesProvider.cs b/src/NzbDrone.Core/Indexers/Newznab/NewznabCapabilitiesProvider.cs index 1491f3290..c7c07e6ab 100644 --- a/src/NzbDrone.Core/Indexers/Newznab/NewznabCapabilitiesProvider.cs +++ b/src/NzbDrone.Core/Indexers/Newznab/NewznabCapabilitiesProvider.cs @@ -67,12 +67,15 @@ namespace NzbDrone.Core.Indexers.Newznab } catch (XmlException ex) { + ex.WithData(response, 128 * 1024); + _logger.Trace("Unexpected Response content ({0} bytes): {1}", response.ResponseData.Length, response.Content); _logger.Debug(ex, "Failed to parse newznab api capabilities for {0}", indexerSettings.BaseUrl); - ex.WithData(response); throw; } catch (Exception ex) { + ex.WithData(response, 128 * 1024); + _logger.Trace("Unexpected Response content ({0} bytes): {1}", response.ResponseData.Length, response.Content); _logger.Error(ex, "Failed to determine newznab api capabilities for {0}, using the defaults instead till Readarr restarts", indexerSettings.BaseUrl); } @@ -87,14 +90,16 @@ namespace NzbDrone.Core.Indexers.Newznab if (xDoc == null) { - throw new XmlException("Invalid XML"); + throw new XmlException("Invalid XML").WithData(response); } + NewznabRssParser.CheckError(xDoc, new IndexerResponse(new IndexerRequest(response.Request), response)); + var xmlRoot = xDoc.Element("caps"); if (xmlRoot == null) { - throw new XmlException("Unexpected XML"); + throw new XmlException("Unexpected XML").WithData(response); } var xmlLimits = xmlRoot.Element("limits"); diff --git a/src/NzbDrone.Core/Indexers/Newznab/NewznabRssParser.cs b/src/NzbDrone.Core/Indexers/Newznab/NewznabRssParser.cs index 8c50b70cd..cf0aeaaef 100644 --- a/src/NzbDrone.Core/Indexers/Newznab/NewznabRssParser.cs +++ b/src/NzbDrone.Core/Indexers/Newznab/NewznabRssParser.cs @@ -18,14 +18,13 @@ namespace NzbDrone.Core.Indexers.Newznab UseEnclosureUrl = true; } - protected override bool PreProcess(IndexerResponse indexerResponse) + public static void CheckError(XDocument xdoc, IndexerResponse indexerResponse) { - var xdoc = LoadXmlDocument(indexerResponse); var error = xdoc.Descendants("error").FirstOrDefault(); if (error == null) { - return true; + return; } var code = Convert.ToInt32(error.Attribute("code").Value); @@ -33,8 +32,7 @@ namespace NzbDrone.Core.Indexers.Newznab if (code >= 100 && code <= 199) { - _logger.Warn("Invalid API Key: {0}", errorMessage); - throw new ApiKeyException("Invalid API key"); + throw new ApiKeyException(errorMessage); } if (!indexerResponse.Request.Url.FullUri.Contains("apikey=") && (errorMessage == "Missing parameter" || errorMessage.Contains("apikey"))) @@ -50,6 +48,15 @@ namespace NzbDrone.Core.Indexers.Newznab throw new NewznabException(indexerResponse, errorMessage); } + protected override bool PreProcess(IndexerResponse indexerResponse) + { + var xdoc = LoadXmlDocument(indexerResponse); + + CheckError(xdoc, indexerResponse); + + return true; + } + protected override bool PostProcess(IndexerResponse indexerResponse, List items, List releases) { var enclosureTypes = items.SelectMany(GetEnclosures).Select(v => v.Type).Distinct().ToArray();