open-source-mirrors
/
Sonarr
mirror of https://github.com/Sonarr/Sonarr
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Better sample checks

Browse Source 
Fixed: Sample checking relies on runtime instead of file size (Windows)
Fixed: Minimum file size for 1080p releases is now 140MB (lower will be considered samples)
pull/37/head
Mark McDowall 11 years ago
parent e7ac2247ab
commit 77a5fd62d2
4 changed files with 89 additions and 60 deletions
Show Stats Download Patch File Download Diff File

92
src/NzbDrone.Core.Test/MediaFiles/EpisodeImport/Specifications/NotSampleSpecificationFixture.cs
Unescape View File

@ -7,6 +7,7 @@ using NUnit.Framework;
using NzbDrone.Core.MediaFiles.EpisodeImport.Specifications;
using NzbDrone.Core.MediaFiles.MediaInfo;
using NzbDrone.Core.Parser.Model;
using NzbDrone.Core.Qualities;
using NzbDrone.Core.Test.Framework;
using NzbDrone.Core.Tv;
using NzbDrone.Test.Common;
@ -36,112 +37,113 @@ namespace NzbDrone.Core.Test.MediaFiles.EpisodeImport.Specifications
{
Path = @"C:\Test\30 Rock\30.rock.s01e01.avi",
Episodes = episodes,
Series = _series
Series = _series,
Quality = new QualityModel(Quality.HDTV720p)
};
}
private void WithDailySeries()
{
_series.SeriesType = SeriesTypes.Daily;
}
private void WithSeasonZero()
{
_localEpisode.Episodes[0].SeasonNumber = 0;
}
private void WithFileSize(long size)
private void GivenFileSize(long size)
{
_localEpisode.Size = size;
}
private void WithLength(int minutes)
private void GivenRuntime(int seconds)
{
Mocker.GetMock<IVideoFileInfoReader>()
.Setup(s => s.GetRunTime(It.IsAny<String>()))
.Returns(new TimeSpan(0, 0, minutes, 0));
.Returns(new TimeSpan(0, 0, seconds));
}
[Test]
public void should_return_true_if_series_is_daily()
{
WithDailySeries();
_series.SeriesType = SeriesTypes.Daily;
Subject.IsSatisfiedBy(_localEpisode).Should().BeTrue();
}
[Test]
public void should_return_true_if_season_zero()
{
WithSeasonZero();
_localEpisode.Episodes[0].SeasonNumber = 0;
Subject.IsSatisfiedBy(_localEpisode).Should().BeTrue();
}
[Test]
public void should_return_true_for_existing_file()
{
_localEpisode.ExistingFile = true;
Subject.IsSatisfiedBy(_localEpisode).Should().BeTrue();
}
[Test]
public void should_return_false_if_undersize_and_under_length()
public void should_return_true_for_flv()
{
WithFileSize(10.Megabytes());
WithLength(1);
_localEpisode.Path = @"C:\Test\some.show.s01e01.flv";
Subject.IsSatisfiedBy(_localEpisode).Should().BeFalse();
Subject.IsSatisfiedBy(_localEpisode).Should().BeTrue();
Mocker.GetMock<IVideoFileInfoReader>().Verify(c => c.GetRunTime(It.IsAny<string>()), Times.Never());
}
[Test]
public void should_return_true_if_undersize()
public void should_not_run_runtime_check_on_linux()
{
WithFileSize(10.Megabytes());
WithLength(10);
LinuxOnly();
GivenFileSize(1000.Megabytes());
Subject.IsSatisfiedBy(_localEpisode).Should().BeTrue();
Subject.IsSatisfiedBy(_localEpisode);
Mocker.GetMock<IVideoFileInfoReader>().Verify(v => v.GetRunTime(It.IsAny<String>()), Times.Never());
}
[Test]
public void should_return_true_if_under_length()
public void should_run_runtime_check_on_windows()
{
WithFileSize(100.Megabytes());
WithLength(1);
GivenRuntime(120);
GivenFileSize(1000.Megabytes());
Subject.IsSatisfiedBy(_localEpisode).Should().BeTrue();
Subject.IsSatisfiedBy(_localEpisode);
Mocker.GetMock<IVideoFileInfoReader>().Verify(v => v.GetRunTime(It.IsAny<String>()), Times.Once());
}
[Test]
public void should_return_true_if_over_size_and_length()
public void should_return_false_if_runtime_is_less_than_minimum()
{
WithFileSize(100.Megabytes());
WithLength(10);
GivenRuntime(60);
Subject.IsSatisfiedBy(_localEpisode).Should().BeTrue();
Subject.IsSatisfiedBy(_localEpisode).Should().BeFalse();
}
[Test]
public void should_not_check_lenght_if_file_is_large_enough()
public void should_return_true_if_runtime_greater_than_than_minimum()
{
WithFileSize(100.Megabytes());
GivenRuntime(120);
Subject.IsSatisfiedBy(_localEpisode).Should().BeTrue();
Mocker.GetMock<IVideoFileInfoReader>().Verify(c => c.GetRunTime(It.IsAny<string>()), Times.Never());
}
[Test]
public void should_log_error_if_run_time_is_0_and_under_sample_size()
public void should_return_false_if_file_size_is_under_minimum()
{
WithFileSize(40.Megabytes());
WithLength(0);
LinuxOnly();
GivenRuntime(120);
GivenFileSize(20.Megabytes());
Subject.IsSatisfiedBy(_localEpisode).Should().BeFalse();
ExceptionVerification.ExpectedErrors(1);
}
[Test]
public void should_skip_check_for_flv_file()
public void should_return_false_if_file_size_is_under_minimum_for_larger_limits()
{
_localEpisode.Path = @"C:\Test\some.show.s01e01.flv";
LinuxOnly();
Subject.IsSatisfiedBy(_localEpisode).Should().BeTrue();
GivenRuntime(120);
GivenFileSize(120.Megabytes());
_localEpisode.Quality = new QualityModel(Quality.Bluray1080p);
Mocker.GetMock<IVideoFileInfoReader>().Verify(c => c.GetRunTime(It.IsAny<string>()), Times.Never());
Subject.IsSatisfiedBy(_localEpisode).Should().BeFalse();
}
}
}

6
src/NzbDrone.Core/MediaFiles/DownloadedEpisodesImportService.cs
Unescape View File

@ -7,7 +7,6 @@ using NzbDrone.Common;
using NzbDrone.Core.Configuration;
using NzbDrone.Core.MediaFiles.Commands;
using NzbDrone.Core.MediaFiles.EpisodeImport;
using NzbDrone.Core.MediaFiles.EpisodeImport.Specifications;
using NzbDrone.Core.Messaging.Commands;
using NzbDrone.Core.Parser;
using NzbDrone.Core.Tv;
@ -74,10 +73,7 @@ namespace NzbDrone.Core.MediaFiles
if (importedFiles.Any())
{
if (_diskProvider.GetFolderSize(subFolder) < NotSampleSpecification.SampleSizeLimit)
{
_diskProvider.DeleteFolder(subFolder, true);
}
_diskProvider.DeleteFolder(subFolder, true);
}
}
catch (Exception e)

2
src/NzbDrone.Core/MediaFiles/EpisodeImport/ImportApprovedEpisodes.cs
Unescape View File

@ -41,7 +41,7 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport
var qualifiedImports = GetQualifiedImports(decisions);
var imported = new List<ImportDecision>();
foreach (var importDecision in qualifiedImports)
foreach (var importDecision in qualifiedImports.OrderByDescending(e => e.LocalEpisode.Size))
{
var localEpisode = importDecision.LocalEpisode;

49
src/NzbDrone.Core/MediaFiles/EpisodeImport/Specifications/NotSampleSpecification.cs
Unescape View File

@ -1,8 +1,11 @@
using System;
using System.Collections.Generic;
using System.IO;
using NLog;
using NzbDrone.Common.EnvironmentInfo;
using NzbDrone.Core.MediaFiles.MediaInfo;
using NzbDrone.Core.Parser.Model;
using NzbDrone.Core.Qualities;
using NzbDrone.Core.Tv;
namespace NzbDrone.Core.MediaFiles.EpisodeImport.Specifications
@ -11,6 +14,7 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport.Specifications
{
private readonly IVideoFileInfoReader _videoFileInfoReader;
private readonly Logger _logger;
private static List<Quality> _largeSampleSizeQualities = new List<Quality> { Quality.HDTV1080p, Quality.WEBDL1080p, Quality.Bluray1080p };
public NotSampleSpecification(IVideoFileInfoReader videoFileInfoReader,
Logger logger)
@ -31,6 +35,12 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport.Specifications
public bool IsSatisfiedBy(LocalEpisode localEpisode)
{
if (localEpisode.ExistingFile)
{
_logger.Trace("Existing file, skipping sample check");
return true;
}
if (localEpisode.Series.SeriesType == SeriesTypes.Daily)
{
_logger.Trace("Daily Series, skipping sample check");
@ -43,28 +53,49 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport.Specifications
return true;
}
if (Path.GetExtension(localEpisode.Path).Equals(".flv", StringComparison.InvariantCultureIgnoreCase))
var extension = Path.GetExtension(localEpisode.Path);
if (extension != null && extension.Equals(".flv", StringComparison.InvariantCultureIgnoreCase))
{
_logger.Trace("Skipping smaple check for .flv file");
_logger.Trace("Skipping sample check for .flv file");
return true;
}
if (localEpisode.Size > SampleSizeLimit)
if (OsInfo.IsWindows)
{
var runTime = _videoFileInfoReader.GetRunTime(localEpisode.Path);
if (runTime.TotalMinutes.Equals(0))
{
_logger.Error("[{0}] has a runtime of 0, is it a valid video file?", localEpisode);
return false;
}
if (runTime.TotalSeconds < 90)
{
_logger.Trace("[{0}] appears to be a sample. Size: {1} Runtime: {2}", localEpisode.Path, localEpisode.Size, runTime);
return false;
}
_logger.Trace("Runtime is over 2 minutes, skipping file size check");
return true;
}
var runTime = _videoFileInfoReader.GetRunTime(localEpisode.Path);
return CheckSize(localEpisode);
}
if (runTime.TotalMinutes.Equals(0))
private bool CheckSize(LocalEpisode localEpisode)
{
if (_largeSampleSizeQualities.Contains(localEpisode.Quality.Quality))
{
_logger.Error("[{0}] has a runtime of 0, is it a valid video file?", localEpisode);
return false;
if (localEpisode.Size < SampleSizeLimit * 2)
{
return false;
}
}
if (runTime.TotalMinutes < 3)
if (localEpisode.Size < SampleSizeLimit)
{
_logger.Trace("[{0}] appears to be a sample. Size: {1} Runtime: {2}", localEpisode.Path, localEpisode.Size, runTime);
return false;
}

Write Preview
Loading…
Cancel
Save