mirror
/
Sonarr
mirror of https://github.com/Sonarr/Sonarr
1
0
Fork 0
Code Issues Releases Wiki Activity

Added episode status to episode grid

This commit is contained in:
kay.one 2011-05-22 10:29:10 -07:00
parent a4f8947d90
commit 7b56711a4f
5 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
NzbDrone.Core.Test/EpisodeStatusTest.cs
View File

@ -115,5 +115,22 @@ namespace NzbDrone.Core.Test
Assert.AreEqual(status, episode.Status); Assert.AreEqual(status, episode.Status);
} }
[Test]
public void low_air_date()
{
Episode episode = Builder<Episode>.CreateNew()
.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.Season = Builder<Season>.CreateNew()
.With(s => s.Monitored = true).Build())
.Build();
Assert.AreEqual(EpisodeStatusType.NotAired, episode.Status);
}
} }
} }

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

@ -49,7 +49,7 @@ namespace NzbDrone.Core.Repository
if (EpisodeFileId != 0) return EpisodeStatusType.Ready; if (EpisodeFileId != 0) return EpisodeStatusType.Ready;
if (DateTime.Now.Date >= AirDate.Date) if (AirDate.Date.Year > 1900 && DateTime.Now.Date >= AirDate.Date)
{ {
return EpisodeStatusType.Missing; return EpisodeStatusType.Missing;
} }

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

@ -15,10 +15,8 @@ namespace NzbDrone.Web.Controllers
public class SeriesController : Controller public class SeriesController : Controller
{ {
private readonly EpisodeProvider _episodeProvider; private readonly EpisodeProvider _episodeProvider;
private readonly MediaFileProvider _mediaFileProvider;
private readonly QualityProvider _qualityProvider; private readonly QualityProvider _qualityProvider;
private readonly RenameProvider _renameProvider; private readonly RenameProvider _renameProvider;
private readonly RootDirProvider _rootDirProvider;
private readonly SeriesProvider _seriesProvider; private readonly SeriesProvider _seriesProvider;
private readonly TvDbProvider _tvDbProvider; private readonly TvDbProvider _tvDbProvider;
private readonly JobProvider _jobProvider; private readonly JobProvider _jobProvider;
@ -28,17 +26,16 @@ namespace NzbDrone.Web.Controllers
public SeriesController(SeriesProvider seriesProvider, public SeriesController(SeriesProvider seriesProvider,
EpisodeProvider episodeProvider, EpisodeProvider episodeProvider,
QualityProvider qualityProvider, MediaFileProvider mediaFileProvider, QualityProvider qualityProvider,
RenameProvider renameProvider, RootDirProvider rootDirProvider, RenameProvider renameProvider,
TvDbProvider tvDbProvider, JobProvider jobProvider, TvDbProvider tvDbProvider,
JobProvider jobProvider,
SeasonProvider seasonProvider) SeasonProvider seasonProvider)
{ {
_seriesProvider = seriesProvider; _seriesProvider = seriesProvider;
_episodeProvider = episodeProvider; _episodeProvider = episodeProvider;
_qualityProvider = qualityProvider; _qualityProvider = qualityProvider;
_mediaFileProvider = mediaFileProvider;
_renameProvider = renameProvider; _renameProvider = renameProvider;
_rootDirProvider = rootDirProvider;
_tvDbProvider = tvDbProvider; _tvDbProvider = tvDbProvider;
_jobProvider = jobProvider; _jobProvider = jobProvider;
_seasonProvider = seasonProvider; _seasonProvider = seasonProvider;
@ -137,6 +134,7 @@ namespace NzbDrone.Web.Controllers
Overview = c.Overview, Overview = c.Overview,
AirDate = c.AirDate, AirDate = c.AirDate,
Path = GetEpisodePath(c.EpisodeFile), Path = GetEpisodePath(c.EpisodeFile),
Status = c.Status.ToString(),
Quality = c.EpisodeFile == null Quality = c.EpisodeFile == null
? String.Empty ? String.Empty
: c.EpisodeFile.Quality.ToString() : c.EpisodeFile.Quality.ToString()

2
NzbDrone.Web/Models/EpisodeModel.cs
View File

@ -1,4 +1,5 @@
using System; using System;
using NzbDrone.Core.Model;
namespace NzbDrone.Web.Models namespace NzbDrone.Web.Models
{ {
@ -10,6 +11,7 @@ namespace NzbDrone.Web.Models
public int SeasonNumber { get; set; } public int SeasonNumber { get; set; }
public string Overview { get; set; } public string Overview { get; set; }
public string Path { get; set; } public string Path { get; set; }
public String Status { get; set; }
public DateTime AirDate { get; set; } public DateTime AirDate { get; set; }
public String Quality { get; set; } public String Quality { get; set; }

1
NzbDrone.Web/Views/Series/Details.cshtml
View File

@ -77,6 +77,7 @@
columns.Bound(c => c.AirDate).Format("{0:d}").Width(10); columns.Bound(c => c.AirDate).Format("{0:d}").Width(10);
columns.Bound(c => c.Quality).Width(10); columns.Bound(c => c.Quality).Width(10);
columns.Bound(c => c.Path); columns.Bound(c => c.Path);
columns.Bound(c => c.Status);
}) })
.DetailView(detailView => detailView.ClientTemplate("<div><#= Overview #> </br><#= Path #> </div>")) .DetailView(detailView => detailView.ClientTemplate("<div><#= Overview #> </br><#= Path #> </div>"))
.ClientEvents(clientEvents => .ClientEvents(clientEvents =>