From 56169b515f8b9117f661cd0fbd655e5d9d2b78ce Mon Sep 17 00:00:00 2001
From: "kay.one" <kay.one@gmail.com>
Date: Wed, 1 Jun 2011 18:16:17 -0700
Subject: [PATCH] fixed broken episode status tests

---
 NzbDrone.Core.Test/EpisodeStatusTest.cs | 14 ++++++--------
 NzbDrone.Core/Repository/Episode.cs     | 12 ++++++------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/NzbDrone.Core.Test/EpisodeStatusTest.cs b/NzbDrone.Core.Test/EpisodeStatusTest.cs
index f84c5d127..61b87ee03 100644
--- a/NzbDrone.Core.Test/EpisodeStatusTest.cs
+++ b/NzbDrone.Core.Test/EpisodeStatusTest.cs
@@ -17,7 +17,6 @@ namespace NzbDrone.Core.Test
         [Row(1, false, false, EpisodeStatusType.NotAired)]
         [Row(-2, false, false, EpisodeStatusType.Missing)]
         [Row(1, true, false, EpisodeStatusType.Ready)]
-        [Row(1, true, true, EpisodeStatusType.Ignored)]
         [Row(1, false, true, EpisodeStatusType.Ignored)]
         public void no_grab_date(int offsetDays, bool hasEpisodes, bool ignored, EpisodeStatusType status)
         {
@@ -43,7 +42,6 @@ namespace NzbDrone.Core.Test
         [Row(1, false, false, EpisodeStatusType.NotAired)]
         [Row(-2, false, false, EpisodeStatusType.Missing)]
         [Row(1, true, false, EpisodeStatusType.Ready)]
-        [Row(1, true, true, EpisodeStatusType.Ignored)]
         [Row(1, false, true, EpisodeStatusType.Ignored)]
         public void old_grab_date(int offsetDays, bool hasEpisodes, bool ignored,
                                                  EpisodeStatusType status)
@@ -70,8 +68,8 @@ namespace NzbDrone.Core.Test
         [Row(1, false, false, EpisodeStatusType.Downloading)]
         [Row(-2, false, false, EpisodeStatusType.Downloading)]
         [Row(1, true, false, EpisodeStatusType.Downloading)]
-        [Row(1, true, true, EpisodeStatusType.Ignored)]
-        [Row(1, false, true, EpisodeStatusType.Ignored)]
+        [Row(1, true, true, EpisodeStatusType.Downloading)]
+        [Row(1, false, true, EpisodeStatusType.Downloading)]
         public void recent_grab_date(int offsetDays, bool hasEpisodes, bool ignored,
                                                     EpisodeStatusType status)
         {
@@ -95,8 +93,6 @@ namespace NzbDrone.Core.Test
         [Test]
         [Row(1, false, false, EpisodeStatusType.Ignored)]
         [Row(-2, false, false, EpisodeStatusType.Ignored)]
-        [Row(1, true, false, EpisodeStatusType.Ignored)]
-        [Row(1, true, true, EpisodeStatusType.Ignored)]
         [Row(1, false, true, EpisodeStatusType.Ignored)]
         public void skipped_season(int offsetDays, bool hasEpisodes, bool ignored, EpisodeStatusType status)
         {
@@ -104,8 +100,10 @@ namespace NzbDrone.Core.Test
                 .With(e => e.AirDate = DateTime.Now.AddDays(offsetDays))
                 .With(e => e.Ignored = ignored)
                 .With(e => e.EpisodeFileId = 0)
+                .With(e => e.GrabDate = null)
                 .With(e => e.Season = Builder<Season>.CreateNew()
                                           .With(s => s.Monitored == false).Build())
+
                 .Build();
 
             if (hasEpisodes)
@@ -124,12 +122,12 @@ namespace NzbDrone.Core.Test
                 .With(e => e.AirDate = DateTime.Now.AddYears(-200))
                 .With(e => e.Ignored = false)
                 .With(e => e.EpisodeFileId = 0)
-                .With(e=>e.GrabDate =null)
+                .With(e => e.GrabDate = null)
                 .With(e => e.Season = Builder<Season>.CreateNew()
                                           .With(s => s.Monitored = true).Build())
                 .Build();
 
-         
+
             Assert.AreEqual(EpisodeStatusType.NotAired, episode.Status);
         }
     }
diff --git a/NzbDrone.Core/Repository/Episode.cs b/NzbDrone.Core/Repository/Episode.cs
index 99d989458..fad97ee6a 100644
--- a/NzbDrone.Core/Repository/Episode.cs
+++ b/NzbDrone.Core/Repository/Episode.cs
@@ -49,17 +49,17 @@ namespace NzbDrone.Core.Repository
         {
             get
             {
-                if (EpisodeFileId != 0) return EpisodeStatusType.Ready;
-
-                var season = Season;
-
-                if (Ignored || (season != null && !season.Monitored)) return EpisodeStatusType.Ignored;
-
                 if (GrabDate != null && GrabDate.Value.AddDays(1) >= DateTime.Now)
                 {
                     return EpisodeStatusType.Downloading;
                 }
 
+                if (EpisodeFileId != 0) return EpisodeStatusType.Ready;
+
+                var season = Season;
+
+                if (Ignored || (season != null && !season.Monitored)) return EpisodeStatusType.Ignored;
+                
                 if (AirDate.Date.Year > 1900 && DateTime.Now.Date >= AirDate.Date)
                 {
                     return EpisodeStatusType.Missing;