Merge branch 'master' of git://github.com/kayone/NzbDrone

This commit is contained in:
Mark McDowall
2011-06-01 20:37:04 -07:00
4 changed files with 31 additions and 27 deletions

View File

@@ -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;