mirror of
https://github.com/Prowlarr/Prowlarr
synced 2026-02-14 10:53:04 +01:00
Fixed: IsAvailable not Right for minAvailability = InCinemas (#4921)
* if minimumAvailability is set to InCinemas InCinemas has no value but physical/digital release dates are known and passed, movie would be marked as Not Available When it should be Missing. This resolves https://github.com/Radarr/Radarr/issues/4920 remove comment * add the tests
This commit is contained in:
geogolem
GitHub
parent
3a7b48825d
commit
b6f2afb212
2 changed files with 143 additions and 38 deletions
117
src/NzbDrone.Core.Test/MovieTests/MovieIsAvailableFixture.cs
Normal file
117
src/NzbDrone.Core.Test/MovieTests/MovieIsAvailableFixture.cs
Normal file
|
|
@ -0,0 +1,117 @@
|
|||
using System;
|
||||
using FizzWare.NBuilder;
|
||||
using FluentAssertions;
|
||||
using NUnit.Framework;
|
||||
using NzbDrone.Core.Movies;
|
||||
using NzbDrone.Core.Test.Framework;
|
||||
|
||||
namespace NzbDrone.Core.Test.MovieTests
|
||||
{
|
||||
[TestFixture]
|
||||
public class MovieIsAvailableFixture : CoreTest
|
||||
{
|
||||
private Movie _movie;
|
||||
|
||||
[SetUp]
|
||||
public void Setup()
|
||||
{
|
||||
_movie = Builder<Movie>.CreateNew()
|
||||
.Build();
|
||||
}
|
||||
|
||||
private void SetMovieProperties(DateTime? cinema, DateTime? physical, DateTime? digital, MovieStatusType minimumAvailability)
|
||||
{
|
||||
_movie.InCinemas = cinema;
|
||||
_movie.PhysicalRelease = physical;
|
||||
_movie.DigitalRelease = digital;
|
||||
_movie.MinimumAvailability = minimumAvailability;
|
||||
}
|
||||
|
||||
//minAvail = TBA
|
||||
[TestCase(null, null, null, MovieStatusType.TBA, true)]
|
||||
[TestCase("2000/01/01 21:10:42", null, null, MovieStatusType.TBA, true)]
|
||||
[TestCase("2100/01/01 21:10:42", null, null, MovieStatusType.TBA, true)]
|
||||
[TestCase(null, "2000/01/01 21:10:42", null, MovieStatusType.TBA, true)]
|
||||
[TestCase(null, "2100/01/01 21:10:42", null, MovieStatusType.TBA, true)]
|
||||
[TestCase(null, null, "2000/01/01 21:10:42", MovieStatusType.TBA, true)]
|
||||
[TestCase(null, null, "2100/01/01 21:10:42", MovieStatusType.TBA, true)]
|
||||
|
||||
//minAvail = Announced
|
||||
[TestCase(null, null, null, MovieStatusType.Announced, true)]
|
||||
[TestCase("2000/01/01 21:10:42", null, null, MovieStatusType.Announced, true)]
|
||||
[TestCase("2100/01/01 21:10:42", null, null, MovieStatusType.Announced, true)]
|
||||
[TestCase(null, "2000/01/01 21:10:42", null, MovieStatusType.Announced, true)]
|
||||
[TestCase(null, "2100/01/01 21:10:42", null, MovieStatusType.Announced, true)]
|
||||
[TestCase(null, null, "2000/01/01 21:10:42", MovieStatusType.Announced, true)]
|
||||
[TestCase(null, null, "2100/01/01 21:10:42", MovieStatusType.Announced, true)]
|
||||
|
||||
//minAvail = InCinemas
|
||||
//InCinemas is known and in the past others are not known or in future
|
||||
[TestCase("2000/01/01 21:10:42", null, null, MovieStatusType.InCinemas, true)]
|
||||
[TestCase("2000/01/01 21:10:42", "2100/01/01 21:10:42", null, MovieStatusType.InCinemas, true)]
|
||||
[TestCase("2000/01/01 21:10:42", "2100/01/01 21:10:42", "2100/01/01 21:10:42", MovieStatusType.InCinemas, true)]
|
||||
[TestCase("2000/01/01 21:10:42", null, "2100/01/01 21:10:42", MovieStatusType.InCinemas, true)]
|
||||
|
||||
//InCinemas is known and in the future others are not known or in future
|
||||
[TestCase("2100/01/01 21:10:42", null, null, MovieStatusType.InCinemas, false)]
|
||||
[TestCase("2100/01/01 21:10:42", "2100/01/01 21:10:42", null, MovieStatusType.InCinemas, false)]
|
||||
[TestCase("2100/01/01 21:10:42", "2100/01/01 21:10:42", "2100/01/01 21:10:42", MovieStatusType.InCinemas, false)]
|
||||
[TestCase("2100/01/01 21:10:42", null, "2100/01/01 21:10:42", MovieStatusType.InCinemas, false)]
|
||||
|
||||
//handle the cases where InCinemas date is not known but Digital/Physical are and passed -- this refers to the issue being fixed along with these tests
|
||||
[TestCase(null, "2000/01/01 21:10:42", null, MovieStatusType.InCinemas, true)]
|
||||
[TestCase(null, "2000/01/01 21:10:42", "2000/01/01 21:10:42", MovieStatusType.InCinemas, true)]
|
||||
[TestCase(null, null, "2000/01/01 21:10:42", MovieStatusType.InCinemas, true)]
|
||||
|
||||
//same as previous but digital/physical are in future
|
||||
[TestCase(null, "2100/01/01 21:10:42", null, MovieStatusType.InCinemas, false)]
|
||||
[TestCase(null, "2100/01/01 21:10:42", "2100/01/01 21:10:42", MovieStatusType.InCinemas, false)]
|
||||
[TestCase(null, null, "2100/01/01 21:10:42", MovieStatusType.InCinemas, false)]
|
||||
|
||||
//no date values
|
||||
[TestCase(null, null, null, MovieStatusType.InCinemas, false)]
|
||||
|
||||
//minAvail = Released
|
||||
[TestCase(null, null, null, MovieStatusType.Released, false)]
|
||||
[TestCase("2000/01/01 21:10:42", null, null, MovieStatusType.Released, true)]
|
||||
[TestCase("2100/01/01 21:10:42", null, null, MovieStatusType.Released, false)]
|
||||
[TestCase(null, "2000/01/01 21:10:42", null, MovieStatusType.Released, true)]
|
||||
[TestCase(null, "2100/01/01 21:10:42", null, MovieStatusType.Released, false)]
|
||||
[TestCase(null, null, "2000/01/01 21:10:42", MovieStatusType.Released, true)]
|
||||
[TestCase(null, null, "2100/01/01 21:10:42", MovieStatusType.Released, false)]
|
||||
public void should_have_correct_availability(DateTime? cinema, DateTime? physical, DateTime? digital, MovieStatusType minimumAvailability, bool result)
|
||||
{
|
||||
SetMovieProperties(cinema, physical, digital, minimumAvailability);
|
||||
_movie.IsAvailable().Should().Be(result);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void positive_delay_should_effect_availability()
|
||||
{
|
||||
SetMovieProperties(null, DateTime.Now.AddDays(-5), null, MovieStatusType.Released);
|
||||
_movie.IsAvailable().Should().BeTrue();
|
||||
_movie.IsAvailable(6).Should().BeFalse();
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void negative_delay_should_effect_availability()
|
||||
{
|
||||
SetMovieProperties(null, DateTime.Now.AddDays(5), null, MovieStatusType.Released);
|
||||
_movie.IsAvailable().Should().BeFalse();
|
||||
_movie.IsAvailable(-6).Should().BeTrue();
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void minimum_availability_released_no_date_but_ninety_days_after_cinemas()
|
||||
{
|
||||
SetMovieProperties(DateTime.Now.AddDays(-91), null, null, MovieStatusType.Released);
|
||||
_movie.IsAvailable().Should().BeTrue();
|
||||
SetMovieProperties(DateTime.Now.AddDays(-89), null, null, MovieStatusType.Released);
|
||||
_movie.IsAvailable().Should().BeFalse();
|
||||
SetMovieProperties(DateTime.Now.AddDays(-89), DateTime.Now.AddDays(-40), null, MovieStatusType.Released);
|
||||
_movie.IsAvailable().Should().BeTrue();
|
||||
SetMovieProperties(DateTime.Now.AddDays(-91), DateTime.Now.AddDays(40), null, MovieStatusType.Released);
|
||||
_movie.IsAvailable().Should().BeFalse();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -107,45 +107,33 @@ public bool IsAvailable(int delay = 0)
|
|||
|
||||
//This more complex sequence handles the delay
|
||||
DateTime minimumAvailabilityDate;
|
||||
switch (MinimumAvailability)
|
||||
|
||||
if ((MinimumAvailability == MovieStatusType.TBA) || (MinimumAvailability == MovieStatusType.Announced))
|
||||
{
|
||||
case MovieStatusType.TBA:
|
||||
case MovieStatusType.Announced:
|
||||
minimumAvailabilityDate = DateTime.MinValue;
|
||||
break;
|
||||
case MovieStatusType.InCinemas:
|
||||
if (InCinemas.HasValue)
|
||||
{
|
||||
minimumAvailabilityDate = InCinemas.Value;
|
||||
}
|
||||
else
|
||||
{
|
||||
minimumAvailabilityDate = DateTime.MaxValue;
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
case MovieStatusType.Released:
|
||||
case MovieStatusType.PreDB:
|
||||
default:
|
||||
if (PhysicalRelease.HasValue && DigitalRelease.HasValue)
|
||||
{
|
||||
minimumAvailabilityDate = new DateTime(Math.Min(PhysicalRelease.Value.Ticks, DigitalRelease.Value.Ticks));
|
||||
}
|
||||
else if (PhysicalRelease.HasValue)
|
||||
{
|
||||
minimumAvailabilityDate = PhysicalRelease.Value;
|
||||
}
|
||||
else if (DigitalRelease.HasValue)
|
||||
{
|
||||
minimumAvailabilityDate = DigitalRelease.Value;
|
||||
}
|
||||
else
|
||||
{
|
||||
minimumAvailabilityDate = InCinemas.HasValue ? InCinemas.Value.AddDays(90) : DateTime.MaxValue;
|
||||
}
|
||||
|
||||
break;
|
||||
minimumAvailabilityDate = DateTime.MinValue;
|
||||
}
|
||||
else if (MinimumAvailability == MovieStatusType.InCinemas && InCinemas.HasValue)
|
||||
{
|
||||
minimumAvailabilityDate = InCinemas.Value;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (PhysicalRelease.HasValue && DigitalRelease.HasValue)
|
||||
{
|
||||
minimumAvailabilityDate = new DateTime(Math.Min(PhysicalRelease.Value.Ticks, DigitalRelease.Value.Ticks));
|
||||
}
|
||||
else if (PhysicalRelease.HasValue)
|
||||
{
|
||||
minimumAvailabilityDate = PhysicalRelease.Value;
|
||||
}
|
||||
else if (DigitalRelease.HasValue)
|
||||
{
|
||||
minimumAvailabilityDate = DigitalRelease.Value;
|
||||
}
|
||||
else
|
||||
{
|
||||
minimumAvailabilityDate = InCinemas.HasValue ? InCinemas.Value.AddDays(90) : DateTime.MaxValue;
|
||||
}
|
||||
}
|
||||
|
||||
if (HasPreDBEntry && MinimumAvailability == MovieStatusType.PreDB)
|
||||
|
|
|
|||
Loading…
Reference in a new issue