From 8900c32ae1e5c55af5961591b867485f86244120 Mon Sep 17 00:00:00 2001
From: Keivan Beigi <kay.one@gmail.com>
Date: Wed, 7 Aug 2013 19:07:07 -0700
Subject: [PATCH] Better RSS date parsing

---
 .../IndexerTests/XElementExtensionsFixture.cs | 25 +++++++++++++++++++
 NzbDrone.Core.Test/NzbDrone.Core.Test.csproj  |  1 +
 NzbDrone.Core/Indexers/XElementExtensions.cs  | 12 ++++++++-
 3 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 NzbDrone.Core.Test/IndexerTests/XElementExtensionsFixture.cs

diff --git a/NzbDrone.Core.Test/IndexerTests/XElementExtensionsFixture.cs b/NzbDrone.Core.Test/IndexerTests/XElementExtensionsFixture.cs
new file mode 100644
index 000000000..d42a822d8
--- /dev/null
+++ b/NzbDrone.Core.Test/IndexerTests/XElementExtensionsFixture.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Xml.Linq;
+using FluentAssertions;
+using NUnit.Framework;
+using NzbDrone.Core.Indexers;
+using NzbDrone.Test.Common;
+
+namespace NzbDrone.Core.Test.IndexerTests
+{
+    [TestFixture]
+    public class XElementExtensionsFixture : TestBase
+    {
+        [TestCase("Wed, 07 Aug 2013 20:37:48 +0000")]
+        [TestCase("Wed, 07 Aug 2013 18:08:46 MST")]
+        public void should_parse_date(string dateString)
+        {
+            var element = new XElement("root");
+            element.Add(new XElement("pubDate", dateString));
+
+            var date = element.PublishDate();
+            date.Year.Should().Be(2013);
+            date.Kind.Should().Be(DateTimeKind.Utc);
+        }
+    }
+}
diff --git a/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj b/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
index 16f498630..63781f0db 100644
--- a/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
+++ b/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
@@ -123,6 +123,7 @@
     <Compile Include="IndexerTests\BasicRssParserFixture.cs" />
     <Compile Include="IndexerTests\IndexerServiceFixture.cs" />
     <Compile Include="IndexerTests\IntegrationTests\IndexerIntegrationTests.cs" />
+    <Compile Include="IndexerTests\XElementExtensionsFixture.cs" />
     <Compile Include="JobTests\JobRepositoryFixture.cs" />
     <Compile Include="DecisionEngineTests\LanguageSpecificationFixture.cs" />
     <Compile Include="JobTests\TestJobs.cs" />
diff --git a/NzbDrone.Core/Indexers/XElementExtensions.cs b/NzbDrone.Core/Indexers/XElementExtensions.cs
index c80e606f3..8460c34d6 100644
--- a/NzbDrone.Core/Indexers/XElementExtensions.cs
+++ b/NzbDrone.Core/Indexers/XElementExtensions.cs
@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
+using System.Text.RegularExpressions;
 using System.Xml.Linq;
 using NLog;
 
@@ -11,6 +13,8 @@ namespace NzbDrone.Core.Indexers
 
         private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
 
+        private static readonly Regex RemoveTimeZoneRegex = new Regex(@"\s[A-Z]{2,4}$", RegexOptions.Compiled);
+
         public static string Title(this XElement item)
         {
             return item.TryGetValue("title", "Unknown");
@@ -22,7 +26,13 @@ namespace NzbDrone.Core.Indexers
 
             try
             {
-                return DateTime.Parse(dateString);
+                DateTime result;
+                if (!DateTime.TryParse(dateString, DateTimeFormatInfo.InvariantInfo, DateTimeStyles.AdjustToUniversal, out result))
+                {
+                    dateString = RemoveTimeZoneRegex.Replace(dateString, "");
+                    result = DateTime.Parse(dateString, DateTimeFormatInfo.InvariantInfo, DateTimeStyles.AdjustToUniversal);
+                }
+                return result.ToUniversalTime();
             }
             catch (FormatException e)
             {