Compare commits

...

1 Commits

Author SHA1 Message Date
Mark McDowall 9a462ce8b5 Fixed: Prefer episode runtime when determining whether a file is a sample
Closes #7086
2024-08-13 21:00:10 -07:00
4 changed files with 119 additions and 40 deletions

View File

@ -39,22 +39,29 @@ namespace NzbDrone.Core.Test.MediaFiles.EpisodeImport
Path = @"C:\Test\30 Rock\30.rock.s01e01.avi", Path = @"C:\Test\30 Rock\30.rock.s01e01.avi",
Episodes = episodes, Episodes = episodes,
Series = _series, Series = _series,
Quality = new QualityModel(Quality.HDTV720p) Quality = new QualityModel(Quality.HDTV720p),
}; };
} }
private void GivenRuntime(int seconds) private void GivenRuntime(int seconds)
{ {
var runtime = new TimeSpan(0, 0, seconds);
Mocker.GetMock<IVideoFileInfoReader>() Mocker.GetMock<IVideoFileInfoReader>()
.Setup(s => s.GetRunTime(It.IsAny<string>())) .Setup(s => s.GetRunTime(It.IsAny<string>()))
.Returns(new TimeSpan(0, 0, seconds)); .Returns(runtime);
_localEpisode.MediaInfo = Builder<MediaInfoModel>.CreateNew().With(m => m.RunTime = runtime).Build();
} }
[Test] [Test]
public void should_return_false_if_season_zero() public void should_return_false_if_season_zero()
{ {
_localEpisode.Episodes[0].SeasonNumber = 0; _localEpisode.Episodes[0].SeasonNumber = 0;
ShouldBeNotSample();
Subject.IsSample(_localEpisode.Series,
_localEpisode.Path,
_localEpisode.IsSpecial).Should().Be(DetectSampleResult.NotSample);
} }
[Test] [Test]
@ -62,7 +69,9 @@ namespace NzbDrone.Core.Test.MediaFiles.EpisodeImport
{ {
_localEpisode.Path = @"C:\Test\some.show.s01e01.flv"; _localEpisode.Path = @"C:\Test\some.show.s01e01.flv";
ShouldBeNotSample(); Subject.IsSample(_localEpisode.Series,
_localEpisode.Path,
_localEpisode.IsSpecial).Should().Be(DetectSampleResult.NotSample);
Mocker.GetMock<IVideoFileInfoReader>().Verify(c => c.GetRunTime(It.IsAny<string>()), Times.Never()); Mocker.GetMock<IVideoFileInfoReader>().Verify(c => c.GetRunTime(It.IsAny<string>()), Times.Never());
} }
@ -72,7 +81,9 @@ namespace NzbDrone.Core.Test.MediaFiles.EpisodeImport
{ {
_localEpisode.Path = @"C:\Test\some.show.s01e01.strm"; _localEpisode.Path = @"C:\Test\some.show.s01e01.strm";
ShouldBeNotSample(); Subject.IsSample(_localEpisode.Series,
_localEpisode.Path,
_localEpisode.IsSpecial).Should().Be(DetectSampleResult.NotSample);
Mocker.GetMock<IVideoFileInfoReader>().Verify(c => c.GetRunTime(It.IsAny<string>()), Times.Never()); Mocker.GetMock<IVideoFileInfoReader>().Verify(c => c.GetRunTime(It.IsAny<string>()), Times.Never());
} }
@ -94,7 +105,9 @@ namespace NzbDrone.Core.Test.MediaFiles.EpisodeImport
{ {
GivenRuntime(60); GivenRuntime(60);
ShouldBeSample(); Subject.IsSample(_localEpisode.Series,
_localEpisode.Path,
_localEpisode.IsSpecial).Should().Be(DetectSampleResult.Sample);
} }
[Test] [Test]
@ -102,7 +115,9 @@ namespace NzbDrone.Core.Test.MediaFiles.EpisodeImport
{ {
GivenRuntime(600); GivenRuntime(600);
ShouldBeNotSample(); Subject.IsSample(_localEpisode.Series,
_localEpisode.Path,
_localEpisode.IsSpecial).Should().Be(DetectSampleResult.NotSample);
} }
[Test] [Test]
@ -111,7 +126,9 @@ namespace NzbDrone.Core.Test.MediaFiles.EpisodeImport
_series.Runtime = 6; _series.Runtime = 6;
GivenRuntime(299); GivenRuntime(299);
ShouldBeNotSample(); Subject.IsSample(_localEpisode.Series,
_localEpisode.Path,
_localEpisode.IsSpecial).Should().Be(DetectSampleResult.NotSample);
} }
[Test] [Test]
@ -120,7 +137,9 @@ namespace NzbDrone.Core.Test.MediaFiles.EpisodeImport
_series.Runtime = 2; _series.Runtime = 2;
GivenRuntime(60); GivenRuntime(60);
ShouldBeNotSample(); Subject.IsSample(_localEpisode.Series,
_localEpisode.Path,
_localEpisode.IsSpecial).Should().Be(DetectSampleResult.NotSample);
} }
[Test] [Test]
@ -129,7 +148,9 @@ namespace NzbDrone.Core.Test.MediaFiles.EpisodeImport
_series.Runtime = 2; _series.Runtime = 2;
GivenRuntime(10); GivenRuntime(10);
ShouldBeSample(); Subject.IsSample(_localEpisode.Series,
_localEpisode.Path,
_localEpisode.IsSpecial).Should().Be(DetectSampleResult.Sample);
} }
[Test] [Test]
@ -152,7 +173,10 @@ namespace NzbDrone.Core.Test.MediaFiles.EpisodeImport
GivenRuntime(600); GivenRuntime(600);
_series.SeriesType = SeriesTypes.Daily; _series.SeriesType = SeriesTypes.Daily;
_localEpisode.Episodes[0].SeasonNumber = 0; _localEpisode.Episodes[0].SeasonNumber = 0;
ShouldBeNotSample();
Subject.IsSample(_localEpisode.Series,
_localEpisode.Path,
_localEpisode.IsSpecial).Should().Be(DetectSampleResult.NotSample);
} }
[Test] [Test]
@ -161,21 +185,33 @@ namespace NzbDrone.Core.Test.MediaFiles.EpisodeImport
_series.SeriesType = SeriesTypes.Anime; _series.SeriesType = SeriesTypes.Anime;
_localEpisode.Episodes[0].SeasonNumber = 0; _localEpisode.Episodes[0].SeasonNumber = 0;
ShouldBeNotSample();
}
private void ShouldBeSample()
{
Subject.IsSample(_localEpisode.Series,
_localEpisode.Path,
_localEpisode.IsSpecial).Should().Be(DetectSampleResult.Sample);
}
private void ShouldBeNotSample()
{
Subject.IsSample(_localEpisode.Series, Subject.IsSample(_localEpisode.Series,
_localEpisode.Path, _localEpisode.Path,
_localEpisode.IsSpecial).Should().Be(DetectSampleResult.NotSample); _localEpisode.IsSpecial).Should().Be(DetectSampleResult.NotSample);
} }
[Test]
public void should_use_runtime_from_media_info()
{
GivenRuntime(120);
_localEpisode.Series.Runtime = 30;
_localEpisode.Episodes.First().Runtime = 30;
Subject.IsSample(_localEpisode).Should().Be(DetectSampleResult.Sample);
Mocker.GetMock<IVideoFileInfoReader>().Verify(v => v.GetRunTime(It.IsAny<string>()), Times.Never());
}
[Test]
public void should_use_runtime_from_episode_over_series()
{
GivenRuntime(120);
_localEpisode.Series.Runtime = 5;
_localEpisode.Episodes.First().Runtime = 30;
Subject.IsSample(_localEpisode).Should().Be(DetectSampleResult.Sample);
}
} }
} }

View File

@ -1,4 +1,4 @@
using System.Linq; using System.Linq;
using FizzWare.NBuilder; using FizzWare.NBuilder;
using FluentAssertions; using FluentAssertions;
using NUnit.Framework; using NUnit.Framework;

View File

@ -1,7 +1,8 @@
using System; using System;
using System.IO; using System.IO;
using NLog; using NLog;
using NzbDrone.Core.MediaFiles.MediaInfo; using NzbDrone.Core.MediaFiles.MediaInfo;
using NzbDrone.Core.Parser.Model;
using NzbDrone.Core.Tv; using NzbDrone.Core.Tv;
namespace NzbDrone.Core.MediaFiles.EpisodeImport namespace NzbDrone.Core.MediaFiles.EpisodeImport
@ -9,6 +10,7 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport
public interface IDetectSample public interface IDetectSample
{ {
DetectSampleResult IsSample(Series series, string path, bool isSpecial); DetectSampleResult IsSample(Series series, string path, bool isSpecial);
DetectSampleResult IsSample(LocalEpisode localEpisode);
} }
public class DetectSample : IDetectSample public class DetectSample : IDetectSample
@ -23,6 +25,51 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport
} }
public DetectSampleResult IsSample(Series series, string path, bool isSpecial) public DetectSampleResult IsSample(Series series, string path, bool isSpecial)
{
var extensionResult = IsSample(path, isSpecial);
if (extensionResult != DetectSampleResult.Indeterminate)
{
return extensionResult;
}
var fileRuntime = _videoFileInfoReader.GetRunTime(path);
if (!fileRuntime.HasValue)
{
_logger.Error("Failed to get runtime from the file, make sure ffprobe is available");
return DetectSampleResult.Indeterminate;
}
return IsSample(path, fileRuntime.Value, series.Runtime);
}
public DetectSampleResult IsSample(LocalEpisode localEpisode)
{
var extensionResult = IsSample(localEpisode.Path, localEpisode.IsSpecial);
if (extensionResult != DetectSampleResult.Indeterminate)
{
return extensionResult;
}
var runtime = 0;
foreach (var episode in localEpisode.Episodes)
{
runtime += episode.Runtime > 0 ? episode.Runtime : localEpisode.Series.Runtime;
}
if (localEpisode.MediaInfo == null)
{
_logger.Error("Failed to get runtime from the file, make sure ffprobe is available");
return DetectSampleResult.Indeterminate;
}
return IsSample(localEpisode.Path, localEpisode.MediaInfo.RunTime, runtime);
}
private DetectSampleResult IsSample(string path, bool isSpecial)
{ {
if (isSpecial) if (isSpecial)
{ {
@ -44,49 +91,45 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport
return DetectSampleResult.NotSample; return DetectSampleResult.NotSample;
} }
// TODO: Use MediaInfo from the import process, no need to re-process the file again here
var runTime = _videoFileInfoReader.GetRunTime(path);
if (!runTime.HasValue)
{
_logger.Error("Failed to get runtime from the file, make sure ffprobe is available");
return DetectSampleResult.Indeterminate; return DetectSampleResult.Indeterminate;
} }
var minimumRuntime = GetMinimumAllowedRuntime(series); private DetectSampleResult IsSample(string path, TimeSpan fileRuntime, int expectedRuntime)
{
var minimumRuntime = GetMinimumAllowedRuntime(expectedRuntime);
if (runTime.Value.TotalMinutes.Equals(0)) if (fileRuntime.TotalMinutes.Equals(0))
{ {
_logger.Error("[{0}] has a runtime of 0, is it a valid video file?", path); _logger.Error("[{0}] has a runtime of 0, is it a valid video file?", path);
return DetectSampleResult.Sample; return DetectSampleResult.Sample;
} }
if (runTime.Value.TotalSeconds < minimumRuntime) if (fileRuntime.TotalSeconds < minimumRuntime)
{ {
_logger.Debug("[{0}] appears to be a sample. Runtime: {1} seconds. Expected at least: {2} seconds", path, runTime, minimumRuntime); _logger.Debug("[{0}] appears to be a sample. Runtime: {1} seconds. Expected at least: {2} seconds", path, fileRuntime, minimumRuntime);
return DetectSampleResult.Sample; return DetectSampleResult.Sample;
} }
_logger.Debug("[{0}] does not appear to be a sample. Runtime {1} seconds is more than minimum of {2} seconds", path, runTime, minimumRuntime); _logger.Debug("[{0}] does not appear to be a sample. Runtime {1} seconds is more than minimum of {2} seconds", path, fileRuntime, minimumRuntime);
return DetectSampleResult.NotSample; return DetectSampleResult.NotSample;
} }
private int GetMinimumAllowedRuntime(Series series) private int GetMinimumAllowedRuntime(int runtime)
{ {
// Anime short - 15 seconds // Anime short - 15 seconds
if (series.Runtime <= 3) if (runtime <= 3)
{ {
return 15; return 15;
} }
// Webisodes - 90 seconds // Webisodes - 90 seconds
if (series.Runtime <= 10) if (runtime <= 10)
{ {
return 90; return 90;
} }
// 30 minute episodes - 5 minutes // 30 minute episodes - 5 minutes
if (series.Runtime <= 30) if (runtime <= 30)
{ {
return 300; return 300;
} }

View File

@ -28,7 +28,7 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport.Specifications
try try
{ {
var sample = _detectSample.IsSample(localEpisode.Series, localEpisode.Path, localEpisode.IsSpecial); var sample = _detectSample.IsSample(localEpisode);
if (sample == DetectSampleResult.Sample) if (sample == DetectSampleResult.Sample)
{ {