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

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<EpisodeParseResult> indexerResults = new List<EpisodeParseResult>();
-
-                    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)

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; }
-        }
-
         /// <summary>
         /// Gets or sets the grab date.
         /// </summary>
@@ -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);
         }

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