mirror of https://github.com/Radarr/Radarr
Fixed: Missing won't show episodes that are on air
This commit is contained in:
parent
b538b450f5
commit
71416eea29
|
@ -1,4 +1,5 @@
|
||||||
using System;
|
using System;
|
||||||
|
using System.Linq;
|
||||||
using FizzWare.NBuilder;
|
using FizzWare.NBuilder;
|
||||||
using FluentAssertions;
|
using FluentAssertions;
|
||||||
using NUnit.Framework;
|
using NUnit.Framework;
|
||||||
|
@ -143,5 +144,24 @@ namespace NzbDrone.Core.Test.TvTests.EpisodeRepositoryTests
|
||||||
|
|
||||||
episodes.TotalRecords.Should().Be(4);
|
episodes.TotalRecords.Should().Be(4);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void should_not_return_episodes_on_air()
|
||||||
|
{
|
||||||
|
var onAirEpisode = Builder<Episode>.CreateNew()
|
||||||
|
.With(e => e.Id = 0)
|
||||||
|
.With(e => e.SeriesId = _monitoredSeries.Id)
|
||||||
|
.With(e => e.EpisodeFileId = 0)
|
||||||
|
.With(e => e.AirDateUtc = DateTime.Now.AddMinutes(-15))
|
||||||
|
.With(e => e.Monitored = true)
|
||||||
|
.Build();
|
||||||
|
|
||||||
|
Db.Insert(onAirEpisode);
|
||||||
|
|
||||||
|
var episodes = Subject.EpisodesWithoutFiles(_pagingSpec, false);
|
||||||
|
|
||||||
|
episodes.TotalRecords.Should().Be(4);
|
||||||
|
episodes.Records.Where(e => e.Id == onAirEpisode.Id).Should().BeEmpty();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -118,7 +118,6 @@ namespace NzbDrone.Core.Tv
|
||||||
|
|
||||||
public PagingSpec<Episode> EpisodesWhereCutoffUnmet(PagingSpec<Episode> pagingSpec, List<QualitiesBelowCutoff> qualitiesBelowCutoff, bool includeSpecials)
|
public PagingSpec<Episode> EpisodesWhereCutoffUnmet(PagingSpec<Episode> pagingSpec, List<QualitiesBelowCutoff> qualitiesBelowCutoff, bool includeSpecials)
|
||||||
{
|
{
|
||||||
var currentTime = DateTime.UtcNow;
|
|
||||||
var startingSeasonNumber = 1;
|
var startingSeasonNumber = 1;
|
||||||
|
|
||||||
if (includeSpecials)
|
if (includeSpecials)
|
||||||
|
@ -126,8 +125,8 @@ namespace NzbDrone.Core.Tv
|
||||||
startingSeasonNumber = 0;
|
startingSeasonNumber = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
pagingSpec.TotalRecords = EpisodesWhereCutoffUnmetQuery(pagingSpec, currentTime, qualitiesBelowCutoff, startingSeasonNumber).GetRowCount();
|
pagingSpec.TotalRecords = EpisodesWhereCutoffUnmetQuery(pagingSpec, qualitiesBelowCutoff, startingSeasonNumber).GetRowCount();
|
||||||
pagingSpec.Records = EpisodesWhereCutoffUnmetQuery(pagingSpec, currentTime, qualitiesBelowCutoff, startingSeasonNumber).ToList();
|
pagingSpec.Records = EpisodesWhereCutoffUnmetQuery(pagingSpec, qualitiesBelowCutoff, startingSeasonNumber).ToList();
|
||||||
|
|
||||||
return pagingSpec;
|
return pagingSpec;
|
||||||
}
|
}
|
||||||
|
@ -196,26 +195,31 @@ namespace NzbDrone.Core.Tv
|
||||||
.Where(pagingSpec.FilterExpression)
|
.Where(pagingSpec.FilterExpression)
|
||||||
.AndWhere(e => e.EpisodeFileId == 0)
|
.AndWhere(e => e.EpisodeFileId == 0)
|
||||||
.AndWhere(e => e.SeasonNumber >= startingSeasonNumber)
|
.AndWhere(e => e.SeasonNumber >= startingSeasonNumber)
|
||||||
.AndWhere(e => e.AirDateUtc <= currentTime)
|
.AndWhere(BuildAirDateUtcCutoffWhereClause(currentTime))
|
||||||
.OrderBy(pagingSpec.OrderByClause(), pagingSpec.ToSortDirection())
|
.OrderBy(pagingSpec.OrderByClause(), pagingSpec.ToSortDirection())
|
||||||
.Skip(pagingSpec.PagingOffset())
|
.Skip(pagingSpec.PagingOffset())
|
||||||
.Take(pagingSpec.PageSize);
|
.Take(pagingSpec.PageSize);
|
||||||
}
|
}
|
||||||
|
|
||||||
private SortBuilder<Episode> EpisodesWhereCutoffUnmetQuery(PagingSpec<Episode> pagingSpec, DateTime currentTime, List<QualitiesBelowCutoff> qualitiesBelowCutoff, int startingSeasonNumber)
|
private SortBuilder<Episode> EpisodesWhereCutoffUnmetQuery(PagingSpec<Episode> pagingSpec, List<QualitiesBelowCutoff> qualitiesBelowCutoff, int startingSeasonNumber)
|
||||||
{
|
{
|
||||||
return Query.Join<Episode, Series>(JoinType.Inner, e => e.Series, (e, s) => e.SeriesId == s.Id)
|
return Query.Join<Episode, Series>(JoinType.Inner, e => e.Series, (e, s) => e.SeriesId == s.Id)
|
||||||
.Join<Episode, EpisodeFile>(JoinType.Left, e => e.EpisodeFile, (e, s) => e.EpisodeFileId == s.Id)
|
.Join<Episode, EpisodeFile>(JoinType.Left, e => e.EpisodeFile, (e, s) => e.EpisodeFileId == s.Id)
|
||||||
.Where(pagingSpec.FilterExpression)
|
.Where(pagingSpec.FilterExpression)
|
||||||
.AndWhere(e => e.EpisodeFileId != 0)
|
.AndWhere(e => e.EpisodeFileId != 0)
|
||||||
.AndWhere(e => e.SeasonNumber >= startingSeasonNumber)
|
.AndWhere(e => e.SeasonNumber >= startingSeasonNumber)
|
||||||
.AndWhere(e => e.AirDateUtc <= currentTime)
|
|
||||||
.AndWhere(BuildQualityCutoffWhereClause(qualitiesBelowCutoff))
|
.AndWhere(BuildQualityCutoffWhereClause(qualitiesBelowCutoff))
|
||||||
.OrderBy(pagingSpec.OrderByClause(), pagingSpec.ToSortDirection())
|
.OrderBy(pagingSpec.OrderByClause(), pagingSpec.ToSortDirection())
|
||||||
.Skip(pagingSpec.PagingOffset())
|
.Skip(pagingSpec.PagingOffset())
|
||||||
.Take(pagingSpec.PageSize);
|
.Take(pagingSpec.PageSize);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private string BuildAirDateUtcCutoffWhereClause(DateTime currentTime)
|
||||||
|
{
|
||||||
|
return String.Format("WHERE datetime(strftime('%s', [t0].[AirDateUtc]) + [t1].[RunTime] * 60, 'unixepoch') <= '{0}'",
|
||||||
|
currentTime.ToString("yyyy-MM-dd HH:mm:ss"));
|
||||||
|
}
|
||||||
|
|
||||||
private string BuildQualityCutoffWhereClause(List<QualitiesBelowCutoff> qualitiesBelowCutoff)
|
private string BuildQualityCutoffWhereClause(List<QualitiesBelowCutoff> qualitiesBelowCutoff)
|
||||||
{
|
{
|
||||||
var clauses = new List<String>();
|
var clauses = new List<String>();
|
||||||
|
|
Loading…
Reference in New Issue