mirror
/
Sonarr
mirror of https://github.com/Sonarr/Sonarr
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed: Misleading error message when Kickass/Torrent Rss indexer returned invalid xml. 

fixes #1058
This commit is contained in:
Taloth Saldono 2016-01-20 21:55:42 +01:00
parent 2f50074123
commit bbfe8c27c6
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/NzbDrone.Core/Indexers/EzrssTorrentRssParser.cs
View File

@ -19,16 +19,13 @@ namespace NzbDrone.Core.Indexers
protected override bool PreProcess(IndexerResponse indexerResponse) protected override bool PreProcess(IndexerResponse indexerResponse)
{ {
using (var xmlTextReader = XmlReader.Create(new StringReader(indexerResponse.Content), new XmlReaderSettings { DtdProcessing = DtdProcessing.Ignore, IgnoreComments = true })) var document = LoadXmlDocument(indexerResponse);
{
var document = XDocument.Load(xmlTextReader);
var items = GetItems(document).ToList(); var items = GetItems(document).ToList();
if (items.Count == 1 && GetTitle(items.First()).Equals("No items exist - Try again later")) if (items.Count == 1 && GetTitle(items.First()).Equals("No items exist - Try again later"))
{ {
throw new IndexerException(indexerResponse, "No results were found"); throw new IndexerException(indexerResponse, "No results were found");
} }
}
return base.PreProcess(indexerResponse); return base.PreProcess(indexerResponse);
} }

2
src/NzbDrone.Core/Indexers/Omgwtfnzbs/OmgwtfnzbsRssParser.cs
View File

@ -17,7 +17,7 @@ namespace NzbDrone.Core.Indexers.Omgwtfnzbs
protected override bool PreProcess(IndexerResponse indexerResponse) protected override bool PreProcess(IndexerResponse indexerResponse)
{ {
var xdoc = XDocument.Parse(indexerResponse.Content); var xdoc = LoadXmlDocument(indexerResponse);
var notice = xdoc.Descendants("notice").FirstOrDefault(); var notice = xdoc.Descendants("notice").FirstOrDefault();
if (notice == null) return true; if (notice == null) return true;