diff --git a/src/NzbDrone.Core.Test/MediaFiles/EpisodeImport/SampleServiceFixture.cs b/src/NzbDrone.Core.Test/MediaFiles/EpisodeImport/SampleServiceFixture.cs index 60db510f1..8e9bcc81a 100644 --- a/src/NzbDrone.Core.Test/MediaFiles/EpisodeImport/SampleServiceFixture.cs +++ b/src/NzbDrone.Core.Test/MediaFiles/EpisodeImport/SampleServiceFixture.cs @@ -54,21 +54,14 @@ namespace NzbDrone.Core.Test.MediaFiles.EpisodeImport } [Test] - public void should_return_true_if_series_is_daily() - { - _series.SeriesType = SeriesTypes.Daily; - ShouldBeFalse(); - } - - [Test] - public void should_return_true_if_season_zero() + public void should_return_false_if_season_zero() { _localEpisode.Episodes[0].SeasonNumber = 0; ShouldBeFalse(); } [Test] - public void should_return_true_for_flv() + public void should_return_false_for_flv() { _localEpisode.Path = @"C:\Test\some.show.s01e01.flv"; @@ -93,7 +86,7 @@ namespace NzbDrone.Core.Test.MediaFiles.EpisodeImport } [Test] - public void should_return_false_if_runtime_is_less_than_minimum() + public void should_return_true_if_runtime_is_less_than_minimum() { GivenRuntime(60); @@ -101,7 +94,7 @@ namespace NzbDrone.Core.Test.MediaFiles.EpisodeImport } [Test] - public void should_return_true_if_runtime_greater_than_than_minimum() + public void should_return_false_if_runtime_greater_than_than_minimum() { GivenRuntime(120); diff --git a/src/NzbDrone.Core/MediaFiles/DownloadedEpisodesImportService.cs b/src/NzbDrone.Core/MediaFiles/DownloadedEpisodesImportService.cs index 62423f203..54d9bb45f 100644 --- a/src/NzbDrone.Core/MediaFiles/DownloadedEpisodesImportService.cs +++ b/src/NzbDrone.Core/MediaFiles/DownloadedEpisodesImportService.cs @@ -185,7 +185,7 @@ namespace NzbDrone.Core.MediaFiles if (!_sampleService.IsSample(series, quality, videoFile, size, episodeParseResult.SeasonNumber)) { - _logger.Warn("Non-sample file has not been imported: [{0}]", videoFile); + _logger.Warn("Non-sample file detected: [{0}]", videoFile); return false; } } diff --git a/src/NzbDrone.Core/MediaFiles/EpisodeImport/SampleService.cs b/src/NzbDrone.Core/MediaFiles/EpisodeImport/SampleService.cs index 2e5e647c5..cf59efdfb 100644 --- a/src/NzbDrone.Core/MediaFiles/EpisodeImport/SampleService.cs +++ b/src/NzbDrone.Core/MediaFiles/EpisodeImport/SampleService.cs @@ -36,12 +36,6 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport public bool IsSample(Series series, QualityModel quality, string path, long size, int seasonNumber) { - if (series.SeriesType == SeriesTypes.Daily) - { - _logger.Debug("Daily Series, skipping sample check"); - return false; - } - if (seasonNumber == 0) { _logger.Debug("Special, skipping sample check");