Archive-Team
/
sonarr-repo-only
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
Mark McDowall 2011-06-18 00:18:29 -07:00
parent d6920ee8ea 0e86653d8a
commit 8f4fe398ed
3 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
NzbDrone.Core/Providers/Jobs/EpisodeSearchJob.cs
View File

@ -70,17 +70,9 @@ namespace NzbDrone.Core.Providers.Jobs
{ {
notification.CurrentMessage = String.Format("Searching for {0} in {1}", episode, indexer.Name); notification.CurrentMessage = String.Format("Searching for {0} in {1}", episode, indexer.Name);
IList<EpisodeParseResult> indexerResults = new List<EpisodeParseResult>(); //TODO:Add support for daily episodes, maybe search using both date and season/episode?
var indexerResults = indexer.FetchEpisode(title, episode.SeasonNumber, episode.EpisodeNumber);
if (episode.IsDailyEpisode)
{
//TODO:Add support for daily episodes
}
else
{
indexerResults = indexer.FetchEpisode(title, episode.SeasonNumber, episode.EpisodeNumber);
}
reports.AddRange(indexerResults); reports.AddRange(indexerResults);
} }
catch (Exception e) catch (Exception e)

10
NzbDrone.Core/Repository/Episode.cs
View File

@ -24,12 +24,6 @@ namespace NzbDrone.Core.Repository
public Boolean Ignored { get; set; } public Boolean Ignored { get; set; }
[Ignore]
public Boolean IsDailyEpisode
{
get { return EpisodeNumber == 0; }
}
/// <summary> /// <summary>
/// Gets or sets the grab date. /// Gets or sets the grab date.
/// </summary> /// </summary>
@ -77,8 +71,8 @@ namespace NzbDrone.Core.Repository
{ {
string seriesTitle = Series == null ? "[NULL]" : Series.Title; string seriesTitle = Series == null ? "[NULL]" : Series.Title;
if (IsDailyEpisode) //if (IsDailyEpisode)
return string.Format("{0} - {1}", seriesTitle, AirDate.Date); // return string.Format("{0} - {1}", seriesTitle, AirDate.Date);
return string.Format("{0} - S{1:00}E{2:00}", seriesTitle, SeasonNumber, EpisodeNumber); return string.Format("{0} - S{1:00}E{2:00}", seriesTitle, SeasonNumber, EpisodeNumber);
} }

2
NzbDrone.Web/Controllers/SeriesController.cs
View File

@ -183,7 +183,7 @@ namespace NzbDrone.Web.Controllers
} }
model.Overview = series.Overview; model.Overview = series.Overview;
model.Seasons = _episodeProvider.GetSeasons(seriesId); model.Seasons = _episodeProvider.GetSeasons(seriesId);
model.Title = series.Status; model.Title = series.Title;
model.SeriesId = series.SeriesId; model.SeriesId = series.SeriesId;
return View(model); return View(model);