From bbfe8c27c6caa5851a80450644c3942c61dd72e0 Mon Sep 17 00:00:00 2001 From: Taloth Saldono Date: Wed, 20 Jan 2016 21:55:42 +0100 Subject: [PATCH] Fixed: Misleading error message when Kickass/Torrent Rss indexer returned invalid xml. fixes #1058 --- src/NzbDrone.Core/Indexers/EzrssTorrentRssParser.cs | 13 +++++-------- .../Indexers/Omgwtfnzbs/OmgwtfnzbsRssParser.cs | 2 +- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/NzbDrone.Core/Indexers/EzrssTorrentRssParser.cs b/src/NzbDrone.Core/Indexers/EzrssTorrentRssParser.cs index 204e59a7b..be980b507 100644 --- a/src/NzbDrone.Core/Indexers/EzrssTorrentRssParser.cs +++ b/src/NzbDrone.Core/Indexers/EzrssTorrentRssParser.cs @@ -19,15 +19,12 @@ namespace NzbDrone.Core.Indexers protected override bool PreProcess(IndexerResponse indexerResponse) { - using (var xmlTextReader = XmlReader.Create(new StringReader(indexerResponse.Content), new XmlReaderSettings { DtdProcessing = DtdProcessing.Ignore, IgnoreComments = true })) - { - var document = XDocument.Load(xmlTextReader); - var items = GetItems(document).ToList(); + var document = LoadXmlDocument(indexerResponse); + var items = GetItems(document).ToList(); - if (items.Count == 1 && GetTitle(items.First()).Equals("No items exist - Try again later")) - { - throw new IndexerException(indexerResponse, "No results were found"); - } + if (items.Count == 1 && GetTitle(items.First()).Equals("No items exist - Try again later")) + { + throw new IndexerException(indexerResponse, "No results were found"); } return base.PreProcess(indexerResponse); diff --git a/src/NzbDrone.Core/Indexers/Omgwtfnzbs/OmgwtfnzbsRssParser.cs b/src/NzbDrone.Core/Indexers/Omgwtfnzbs/OmgwtfnzbsRssParser.cs index 4077cd26a..359194e82 100644 --- a/src/NzbDrone.Core/Indexers/Omgwtfnzbs/OmgwtfnzbsRssParser.cs +++ b/src/NzbDrone.Core/Indexers/Omgwtfnzbs/OmgwtfnzbsRssParser.cs @@ -17,7 +17,7 @@ namespace NzbDrone.Core.Indexers.Omgwtfnzbs protected override bool PreProcess(IndexerResponse indexerResponse) { - var xdoc = XDocument.Parse(indexerResponse.Content); + var xdoc = LoadXmlDocument(indexerResponse); var notice = xdoc.Descendants("notice").FirstOrDefault(); if (notice == null) return true;