From a12e148d54fe41a32ecd50bc9d02584272bb6965 Mon Sep 17 00:00:00 2001 From: "kay.one" Date: Fri, 17 Jun 2011 23:39:14 -0700 Subject: [PATCH 1/2] Removed unnecessary IsDailyFlag from episode.cs --- NzbDrone.Core/Providers/Jobs/EpisodeSearchJob.cs | 14 +++----------- NzbDrone.Core/Repository/Episode.cs | 10 ++-------- 2 files changed, 5 insertions(+), 19 deletions(-) diff --git a/NzbDrone.Core/Providers/Jobs/EpisodeSearchJob.cs b/NzbDrone.Core/Providers/Jobs/EpisodeSearchJob.cs index d88c433fc..97f5e3f24 100644 --- a/NzbDrone.Core/Providers/Jobs/EpisodeSearchJob.cs +++ b/NzbDrone.Core/Providers/Jobs/EpisodeSearchJob.cs @@ -70,17 +70,9 @@ namespace NzbDrone.Core.Providers.Jobs { notification.CurrentMessage = String.Format("Searching for {0} in {1}", episode, indexer.Name); - IList indexerResults = new List(); - - if (episode.IsDailyEpisode) - { - //TODO:Add support for daily episodes - } - else - { - indexerResults = indexer.FetchEpisode(title, episode.SeasonNumber, episode.EpisodeNumber); - } - + //TODO:Add support for daily episodes, maybe search using both date and season/episode? + var indexerResults = indexer.FetchEpisode(title, episode.SeasonNumber, episode.EpisodeNumber); + reports.AddRange(indexerResults); } catch (Exception e) diff --git a/NzbDrone.Core/Repository/Episode.cs b/NzbDrone.Core/Repository/Episode.cs index b8145814f..38afcc1d3 100644 --- a/NzbDrone.Core/Repository/Episode.cs +++ b/NzbDrone.Core/Repository/Episode.cs @@ -24,12 +24,6 @@ namespace NzbDrone.Core.Repository public Boolean Ignored { get; set; } - [Ignore] - public Boolean IsDailyEpisode - { - get { return EpisodeNumber == 0; } - } - /// /// Gets or sets the grab date. /// @@ -77,8 +71,8 @@ namespace NzbDrone.Core.Repository { string seriesTitle = Series == null ? "[NULL]" : Series.Title; - if (IsDailyEpisode) - return string.Format("{0} - {1}", seriesTitle, AirDate.Date); + //if (IsDailyEpisode) + // return string.Format("{0} - {1}", seriesTitle, AirDate.Date); return string.Format("{0} - S{1:00}E{2:00}", seriesTitle, SeasonNumber, EpisodeNumber); } From 0e86653d8acceebc17f096cdf42cdc1dea671b1b Mon Sep 17 00:00:00 2001 From: "kay.one" Date: Fri, 17 Jun 2011 23:41:31 -0700 Subject: [PATCH 2/2] Fixed bug where status was shown instead of title on SeriesDetail page --- NzbDrone.Web/Controllers/SeriesController.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NzbDrone.Web/Controllers/SeriesController.cs b/NzbDrone.Web/Controllers/SeriesController.cs index 62cf93632..20b8c4e4f 100644 --- a/NzbDrone.Web/Controllers/SeriesController.cs +++ b/NzbDrone.Web/Controllers/SeriesController.cs @@ -183,7 +183,7 @@ namespace NzbDrone.Web.Controllers } model.Overview = series.Overview; model.Seasons = _episodeProvider.GetSeasons(seriesId); - model.Title = series.Status; + model.Title = series.Title; model.SeriesId = series.SeriesId; return View(model);