From 174689f533a4a3d0d01853c091cefce8b446f358 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Tue, 17 Sep 2013 17:59:40 -0700 Subject: [PATCH] Fixed: Issue parsing size from newznab mocking indexers --- NzbDrone.Core/Indexers/Newznab/NewznabParser.cs | 6 +++--- NzbDrone.Core/Indexers/RssParserBase.cs | 4 ---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/NzbDrone.Core/Indexers/Newznab/NewznabParser.cs b/NzbDrone.Core/Indexers/Newznab/NewznabParser.cs index 06c45ea1d..fc9e54d93 100644 --- a/NzbDrone.Core/Indexers/Newznab/NewznabParser.cs +++ b/NzbDrone.Core/Indexers/Newznab/NewznabParser.cs @@ -17,12 +17,12 @@ namespace NzbDrone.Core.Indexers.Newznab var attributes = item.Elements("attr").ToList(); var sizeElement = attributes.SingleOrDefault(e => e.Attribute("name").Value.Equals("size", StringComparison.CurrentCultureIgnoreCase)); - if (sizeElement == null) + if (sizeElement != null) { - + return Convert.ToInt64(sizeElement.Attribute("value").Value); } - return Convert.ToInt64(sizeElement.Attribute("value").Value); + return ParseSize(item.Description()); } protected override ReleaseInfo PostProcessor(XElement item, ReleaseInfo currentResult) diff --git a/NzbDrone.Core/Indexers/RssParserBase.cs b/NzbDrone.Core/Indexers/RssParserBase.cs index 485bc0140..ca4bf91f8 100644 --- a/NzbDrone.Core/Indexers/RssParserBase.cs +++ b/NzbDrone.Core/Indexers/RssParserBase.cs @@ -108,8 +108,6 @@ namespace NzbDrone.Core.Indexers return currentResult; } - - public static string ParseReleaseGroup(string title) { title = title.Trim(); @@ -132,8 +130,6 @@ namespace NzbDrone.Core.Indexers private static readonly Regex ReportSizeRegex = new Regex(@"(?\d+\.\d{1,2}|\d+\,\d+\.\d{1,2}|\d+)\W?(?GB|MB|GiB|MiB)", RegexOptions.IgnoreCase | RegexOptions.Compiled); - - public static long ParseSize(string sizeString) { var match = ReportSizeRegex.Matches(sizeString);