Merge branch 'markus' into kay.one
This commit is contained in:
kay.one
commit
c1b5f2ebb6
|
|
@ -106,7 +106,16 @@ namespace NzbDrone.Common
|
||||||
|
|
||||||
public virtual void MoveDirectory(string source, string destination)
|
public virtual void MoveDirectory(string source, string destination)
|
||||||
{
|
{
|
||||||
Directory.Move(source, destination);
|
try
|
||||||
|
{
|
||||||
|
Directory.Move(source, destination);
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
e.Data.Add("Source", source);
|
||||||
|
e.Data.Add("Destination", destination);
|
||||||
|
throw;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public virtual void InheritFolderPermissions(string filename)
|
public virtual void InheritFolderPermissions(string filename)
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,7 @@
|
||||||
using NUnit.Framework;
|
using NUnit.Framework;
|
||||||
using Ninject;
|
using Ninject;
|
||||||
using NzbDrone.Common;
|
using NzbDrone.Common;
|
||||||
|
using NzbDrone.Core.Model.Notification;
|
||||||
using NzbDrone.Test.Common;
|
using NzbDrone.Test.Common;
|
||||||
using PetaPoco;
|
using PetaPoco;
|
||||||
|
|
||||||
|
|
@ -39,7 +40,7 @@ namespace NzbDrone.Core.Test.Framework
|
||||||
|
|
||||||
|
|
||||||
[SetUp]
|
[SetUp]
|
||||||
public virtual void SetupBase()
|
public virtual void CoreTestSetup()
|
||||||
{
|
{
|
||||||
LiveKernel = new StandardKernel();
|
LiveKernel = new StandardKernel();
|
||||||
}
|
}
|
||||||
|
|
@ -59,5 +60,14 @@ namespace NzbDrone.Core.Test.Framework
|
||||||
Db = MockLib.GetEmptyDatabase();
|
Db = MockLib.GetEmptyDatabase();
|
||||||
Mocker.SetConstant(Db);
|
Mocker.SetConstant(Db);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
protected ProgressNotification MockNotification
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
return new ProgressNotification("Mock notification");
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -84,6 +84,8 @@
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Compile Include="JobTests\BacklogSearchJobTest.cs" />
|
<Compile Include="JobTests\BacklogSearchJobTest.cs" />
|
||||||
<Compile Include="JobTests\BannerDownloadJobTest.cs" />
|
<Compile Include="JobTests\BannerDownloadJobTest.cs" />
|
||||||
|
<Compile Include="ProviderTests\SearchProviderTests\PerformSearchFixture.cs" />
|
||||||
|
<Compile Include="ProviderTests\SearchProviderTests\ProcessSearchResultsFixture.cs" />
|
||||||
<Compile Include="ProviderTests\NewznabProviderTest.cs" />
|
<Compile Include="ProviderTests\NewznabProviderTest.cs" />
|
||||||
<Compile Include="ProviderTests\DiskProviderTests\FreeDiskSpaceTest.cs" />
|
<Compile Include="ProviderTests\DiskProviderTests\FreeDiskSpaceTest.cs" />
|
||||||
<Compile Include="ProviderTests\ProwlProviderTest.cs" />
|
<Compile Include="ProviderTests\ProwlProviderTest.cs" />
|
||||||
|
|
@ -101,9 +103,7 @@
|
||||||
<Compile Include="ProviderTests\QualityTypeProviderTest.cs" />
|
<Compile Include="ProviderTests\QualityTypeProviderTest.cs" />
|
||||||
<Compile Include="ProviderTests\MisnamedProviderTest.cs" />
|
<Compile Include="ProviderTests\MisnamedProviderTest.cs" />
|
||||||
<Compile Include="JobTests\SeasonSearchJobTest.cs" />
|
<Compile Include="JobTests\SeasonSearchJobTest.cs" />
|
||||||
<Compile Include="ProviderTests\SearchProviderTest_PartialSeason.cs" />
|
|
||||||
<Compile Include="JobTests\SeriesSearchJobTest.cs" />
|
<Compile Include="JobTests\SeriesSearchJobTest.cs" />
|
||||||
<Compile Include="ProviderTests\SearchProviderTest_Season.cs" />
|
|
||||||
<Compile Include="ProviderTests\EventClientProviderTest.cs" />
|
<Compile Include="ProviderTests\EventClientProviderTest.cs" />
|
||||||
<Compile Include="CentralDispatchFixture.cs" />
|
<Compile Include="CentralDispatchFixture.cs" />
|
||||||
<Compile Include="ProviderTests\XbmcProviderTest.cs" />
|
<Compile Include="ProviderTests\XbmcProviderTest.cs" />
|
||||||
|
|
@ -118,7 +118,6 @@
|
||||||
<Compile Include="Framework\CoreTest.cs" />
|
<Compile Include="Framework\CoreTest.cs" />
|
||||||
<Compile Include="ProviderTests\InventoryProvider_IsMonitoredTest.cs" />
|
<Compile Include="ProviderTests\InventoryProvider_IsMonitoredTest.cs" />
|
||||||
<Compile Include="ProviderTests\DownloadProviderTest.cs" />
|
<Compile Include="ProviderTests\DownloadProviderTest.cs" />
|
||||||
<Compile Include="ProviderTests\SearchProviderTest_Episode.cs" />
|
|
||||||
<Compile Include="EpisodeStatusTest.cs" />
|
<Compile Include="EpisodeStatusTest.cs" />
|
||||||
<Compile Include="JobTests\ImportNewSeriesJobTest.cs" />
|
<Compile Include="JobTests\ImportNewSeriesJobTest.cs" />
|
||||||
<Compile Include="JobTests\DiskScanJobTest.cs" />
|
<Compile Include="JobTests\DiskScanJobTest.cs" />
|
||||||
|
|
|
||||||
|
|
@ -1,437 +0,0 @@
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
|
|
||||||
using FizzWare.NBuilder;
|
|
||||||
using FluentAssertions;
|
|
||||||
using Moq;
|
|
||||||
using NUnit.Framework;
|
|
||||||
using NzbDrone.Core.Model;
|
|
||||||
using NzbDrone.Core.Model.Notification;
|
|
||||||
using NzbDrone.Core.Providers;
|
|
||||||
using NzbDrone.Core.Providers.Indexer;
|
|
||||||
using NzbDrone.Core.Repository;
|
|
||||||
using NzbDrone.Core.Repository.Quality;
|
|
||||||
using NzbDrone.Core.Test.Framework;
|
|
||||||
using NzbDrone.Test.Common;
|
|
||||||
using NzbDrone.Test.Common.AutoMoq;
|
|
||||||
|
|
||||||
namespace NzbDrone.Core.Test.ProviderTests
|
|
||||||
{
|
|
||||||
[TestFixture]
|
|
||||||
// ReSharper disable InconsistentNaming
|
|
||||||
public class SearchProviderTest_Episode : CoreTest
|
|
||||||
{
|
|
||||||
[Test]
|
|
||||||
public void processResults_ParseResult_should_return_after_match()
|
|
||||||
{
|
|
||||||
var parseResults = Builder<EpisodeParseResult>.CreateListOfSize(5)
|
|
||||||
.Build();
|
|
||||||
|
|
||||||
var episode = Builder<Episode>.CreateNew().Build();
|
|
||||||
|
|
||||||
var mocker = new AutoMoqer(MockBehavior.Strict);
|
|
||||||
|
|
||||||
mocker.GetMock<InventoryProvider>()
|
|
||||||
.Setup(c => c.IsQualityNeeded(It.IsAny<EpisodeParseResult>())).Returns(true);
|
|
||||||
|
|
||||||
|
|
||||||
mocker.GetMock<DownloadProvider>()
|
|
||||||
.Setup(c => c.DownloadReport(It.IsAny<EpisodeParseResult>())).Returns(true);
|
|
||||||
|
|
||||||
|
|
||||||
//Act
|
|
||||||
mocker.Resolve<SearchProvider>().ProcessEpisodeSearchResults(new ProgressNotification("Test"), episode, parseResults);
|
|
||||||
|
|
||||||
//Assert
|
|
||||||
mocker.VerifyAllMocks();
|
|
||||||
mocker.GetMock<InventoryProvider>().Verify(c => c.IsQualityNeeded(It.IsAny<EpisodeParseResult>()),
|
|
||||||
Times.Once());
|
|
||||||
mocker.GetMock<DownloadProvider>().Verify(c => c.DownloadReport(It.IsAny<EpisodeParseResult>()),
|
|
||||||
Times.Once());
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
[Test]
|
|
||||||
public void processResults_higher_quality_should_be_called_first()
|
|
||||||
{
|
|
||||||
var parseResults = Builder<EpisodeParseResult>.CreateListOfSize(10)
|
|
||||||
.All().With(c => c.Quality = new Quality(QualityTypes.DVD, true))
|
|
||||||
.Random(1).With(c => c.Quality = new Quality(QualityTypes.Bluray1080p, true))
|
|
||||||
.Build();
|
|
||||||
|
|
||||||
var episode = Builder<Episode>.CreateNew().Build();
|
|
||||||
|
|
||||||
var mocker = new AutoMoqer(MockBehavior.Strict);
|
|
||||||
|
|
||||||
mocker.GetMock<InventoryProvider>()
|
|
||||||
.Setup(
|
|
||||||
c =>
|
|
||||||
c.IsQualityNeeded(It.Is<EpisodeParseResult>(d => d.Quality.QualityType == QualityTypes.Bluray1080p)))
|
|
||||||
.Returns(true);
|
|
||||||
|
|
||||||
mocker.GetMock<DownloadProvider>()
|
|
||||||
.Setup(
|
|
||||||
c =>
|
|
||||||
c.DownloadReport(It.Is<EpisodeParseResult>(d => d.Quality.QualityType == QualityTypes.Bluray1080p)))
|
|
||||||
.Returns(true);
|
|
||||||
|
|
||||||
//Act
|
|
||||||
mocker.Resolve<SearchProvider>().ProcessEpisodeSearchResults(new ProgressNotification("Test"), episode, parseResults);
|
|
||||||
|
|
||||||
//Assert
|
|
||||||
mocker.VerifyAllMocks();
|
|
||||||
mocker.GetMock<InventoryProvider>().Verify(c => c.IsQualityNeeded(It.IsAny<EpisodeParseResult>()),
|
|
||||||
Times.Once());
|
|
||||||
mocker.GetMock<DownloadProvider>().Verify(c => c.DownloadReport(It.IsAny<EpisodeParseResult>()),
|
|
||||||
Times.Once());
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
[Test]
|
|
||||||
public void processResults_when_same_quality_proper_should_be_called_first()
|
|
||||||
{
|
|
||||||
var parseResults = Builder<EpisodeParseResult>.CreateListOfSize(20)
|
|
||||||
.All().With(c => c.Quality = new Quality(QualityTypes.DVD, false))
|
|
||||||
.Random(1).With(c => c.Quality = new Quality(QualityTypes.DVD, true))
|
|
||||||
.Build();
|
|
||||||
|
|
||||||
parseResults.Where(c => c.Quality.Proper).Should().HaveCount(1);
|
|
||||||
|
|
||||||
var episode = Builder<Episode>.CreateNew().Build();
|
|
||||||
|
|
||||||
var mocker = new AutoMoqer(MockBehavior.Strict);
|
|
||||||
|
|
||||||
mocker.GetMock<InventoryProvider>()
|
|
||||||
.Setup(c => c.IsQualityNeeded(It.Is<EpisodeParseResult>(p => p.Quality.Proper))).Returns(true);
|
|
||||||
|
|
||||||
mocker.GetMock<DownloadProvider>()
|
|
||||||
.Setup(c => c.DownloadReport(It.Is<EpisodeParseResult>(p => p.Quality.Proper))).Returns(true);
|
|
||||||
|
|
||||||
|
|
||||||
//Act
|
|
||||||
mocker.Resolve<SearchProvider>().ProcessEpisodeSearchResults(new ProgressNotification("Test"), episode, parseResults);
|
|
||||||
|
|
||||||
//Assert
|
|
||||||
mocker.VerifyAllMocks();
|
|
||||||
mocker.GetMock<InventoryProvider>().Verify(c => c.IsQualityNeeded(It.IsAny<EpisodeParseResult>()),
|
|
||||||
Times.Once());
|
|
||||||
mocker.GetMock<DownloadProvider>().Verify(c => c.DownloadReport(It.IsAny<EpisodeParseResult>()),
|
|
||||||
Times.Once());
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
[Test]
|
|
||||||
public void processResults_when_not_needed_should_check_the_rest()
|
|
||||||
{
|
|
||||||
var parseResults = Builder<EpisodeParseResult>.CreateListOfSize(4)
|
|
||||||
.Build();
|
|
||||||
|
|
||||||
var episode = Builder<Episode>.CreateNew().Build();
|
|
||||||
|
|
||||||
var mocker = new AutoMoqer(MockBehavior.Strict);
|
|
||||||
|
|
||||||
mocker.GetMock<InventoryProvider>()
|
|
||||||
.Setup(c => c.IsQualityNeeded(It.IsAny<EpisodeParseResult>())).Returns(false);
|
|
||||||
|
|
||||||
//Act
|
|
||||||
mocker.Resolve<SearchProvider>().ProcessEpisodeSearchResults(new ProgressNotification("Test"), episode, parseResults);
|
|
||||||
|
|
||||||
//Assert
|
|
||||||
mocker.VerifyAllMocks();
|
|
||||||
mocker.GetMock<InventoryProvider>().Verify(c => c.IsQualityNeeded(It.IsAny<EpisodeParseResult>()),
|
|
||||||
Times.Exactly(4));
|
|
||||||
ExceptionVerification.ExcpectedWarns(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
[Test]
|
|
||||||
public void processResults_failed_IsNeeded_should_check_the_rest()
|
|
||||||
{
|
|
||||||
var parseResults = Builder<EpisodeParseResult>.CreateListOfSize(4)
|
|
||||||
.Build();
|
|
||||||
|
|
||||||
var episode = Builder<Episode>.CreateNew().Build();
|
|
||||||
|
|
||||||
var mocker = new AutoMoqer(MockBehavior.Strict);
|
|
||||||
|
|
||||||
mocker.GetMock<InventoryProvider>()
|
|
||||||
.Setup(c => c.IsQualityNeeded(It.IsAny<EpisodeParseResult>())).Throws(new Exception());
|
|
||||||
|
|
||||||
//Act
|
|
||||||
mocker.Resolve<SearchProvider>().ProcessEpisodeSearchResults(new ProgressNotification("Test"), episode, parseResults);
|
|
||||||
|
|
||||||
//Assert
|
|
||||||
mocker.VerifyAllMocks();
|
|
||||||
mocker.GetMock<InventoryProvider>().Verify(c => c.IsQualityNeeded(It.IsAny<EpisodeParseResult>()),
|
|
||||||
Times.Exactly(4));
|
|
||||||
ExceptionVerification.ExcpectedErrors(4);
|
|
||||||
ExceptionVerification.ExcpectedWarns(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
[Test]
|
|
||||||
public void processResults_failed_download_should_not_check_the_rest()
|
|
||||||
{
|
|
||||||
var parseResults = Builder<EpisodeParseResult>.CreateListOfSize(4)
|
|
||||||
.Build();
|
|
||||||
|
|
||||||
var episode = Builder<Episode>.CreateNew().Build();
|
|
||||||
|
|
||||||
var mocker = new AutoMoqer(MockBehavior.Strict);
|
|
||||||
|
|
||||||
mocker.GetMock<InventoryProvider>()
|
|
||||||
.Setup(c => c.IsQualityNeeded(It.IsAny<EpisodeParseResult>())).Returns(true);
|
|
||||||
|
|
||||||
mocker.GetMock<DownloadProvider>()
|
|
||||||
.Setup(c => c.DownloadReport(It.IsAny<EpisodeParseResult>())).Throws(new Exception());
|
|
||||||
|
|
||||||
//Act
|
|
||||||
mocker.Resolve<SearchProvider>().ProcessEpisodeSearchResults(new ProgressNotification("Test"), episode, parseResults);
|
|
||||||
|
|
||||||
//Assert
|
|
||||||
mocker.VerifyAllMocks();
|
|
||||||
mocker.GetMock<InventoryProvider>().Verify(c => c.IsQualityNeeded(It.IsAny<EpisodeParseResult>()),
|
|
||||||
Times.Exactly(1));
|
|
||||||
|
|
||||||
mocker.GetMock<DownloadProvider>().Verify(c => c.DownloadReport(It.IsAny<EpisodeParseResult>()),
|
|
||||||
Times.Exactly(1));
|
|
||||||
|
|
||||||
ExceptionVerification.ExcpectedErrors(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
[Test]
|
|
||||||
public void start_should_search_all_providers()
|
|
||||||
{
|
|
||||||
var parseResults = Builder<EpisodeParseResult>.CreateListOfSize(4)
|
|
||||||
.Build();
|
|
||||||
|
|
||||||
var episode = Builder<Episode>.CreateNew()
|
|
||||||
.With(c => c.Series = Builder<Series>.CreateNew().Build())
|
|
||||||
.With(c => c.SeasonNumber = 12)
|
|
||||||
.Build();
|
|
||||||
|
|
||||||
var mocker = new AutoMoqer(MockBehavior.Strict);
|
|
||||||
|
|
||||||
mocker.GetMock<EpisodeProvider>()
|
|
||||||
.Setup(c => c.GetEpisode(episode.EpisodeId))
|
|
||||||
.Returns(episode);
|
|
||||||
|
|
||||||
var indexer1 = new Mock<IndexerBase>();
|
|
||||||
indexer1.Setup(c => c.FetchEpisode(episode.Series.Title, episode.SeasonNumber, episode.EpisodeNumber))
|
|
||||||
.Returns(parseResults).Verifiable();
|
|
||||||
|
|
||||||
var indexer2 = new Mock<IndexerBase>();
|
|
||||||
indexer2.Setup(c => c.FetchEpisode(episode.Series.Title, episode.SeasonNumber, episode.EpisodeNumber))
|
|
||||||
.Returns(parseResults).Verifiable();
|
|
||||||
|
|
||||||
var indexers = new List<IndexerBase> { indexer1.Object, indexer2.Object };
|
|
||||||
|
|
||||||
mocker.GetMock<IndexerProvider>()
|
|
||||||
.Setup(c => c.GetEnabledIndexers())
|
|
||||||
.Returns(indexers);
|
|
||||||
|
|
||||||
mocker.GetMock<SeriesProvider>()
|
|
||||||
.Setup(c => c.GetSeries(It.IsAny<int>()))
|
|
||||||
.Returns(episode.Series);
|
|
||||||
|
|
||||||
mocker.GetMock<InventoryProvider>()
|
|
||||||
.Setup(c => c.IsQualityNeeded(It.IsAny<EpisodeParseResult>())).Returns(false);
|
|
||||||
|
|
||||||
mocker.GetMock<SceneMappingProvider>()
|
|
||||||
.Setup(s => s.GetSceneName(It.IsAny<int>())).Returns("");
|
|
||||||
|
|
||||||
//Act
|
|
||||||
mocker.Resolve<SearchProvider>().EpisodeSearch(new ProgressNotification("Test"), episode.EpisodeId);
|
|
||||||
|
|
||||||
|
|
||||||
//Assert
|
|
||||||
mocker.VerifyAllMocks();
|
|
||||||
mocker.GetMock<InventoryProvider>().Verify(c => c.IsQualityNeeded(It.IsAny<EpisodeParseResult>()),
|
|
||||||
Times.Exactly(8));
|
|
||||||
ExceptionVerification.ExcpectedWarns(1);
|
|
||||||
indexer1.VerifyAll();
|
|
||||||
indexer2.VerifyAll();
|
|
||||||
}
|
|
||||||
|
|
||||||
[Test]
|
|
||||||
public void start_should_use_scene_name_to_search()
|
|
||||||
{
|
|
||||||
var parseResults = Builder<EpisodeParseResult>.CreateListOfSize(4)
|
|
||||||
.Build();
|
|
||||||
|
|
||||||
var episode = Builder<Episode>.CreateNew()
|
|
||||||
.With(c => c.Series = Builder<Series>.CreateNew().With(s => s.SeriesId = 71256).Build())
|
|
||||||
.With(c => c.SeasonNumber = 12)
|
|
||||||
.Build();
|
|
||||||
|
|
||||||
var mocker = new AutoMoqer(MockBehavior.Strict);
|
|
||||||
|
|
||||||
mocker.GetMock<EpisodeProvider>()
|
|
||||||
.Setup(c => c.GetEpisode(episode.EpisodeId))
|
|
||||||
.Returns(episode);
|
|
||||||
|
|
||||||
var indexer1 = new Mock<IndexerBase>();
|
|
||||||
indexer1.Setup(c => c.FetchEpisode("The Daily Show", episode.SeasonNumber, episode.EpisodeNumber))
|
|
||||||
.Returns(parseResults).Verifiable();
|
|
||||||
|
|
||||||
var indexer2 = new Mock<IndexerBase>();
|
|
||||||
indexer2.Setup(c => c.FetchEpisode("The Daily Show", episode.SeasonNumber, episode.EpisodeNumber))
|
|
||||||
.Returns(parseResults).Verifiable();
|
|
||||||
|
|
||||||
var indexers = new List<IndexerBase> { indexer1.Object, indexer2.Object };
|
|
||||||
|
|
||||||
mocker.GetMock<IndexerProvider>()
|
|
||||||
.Setup(c => c.GetEnabledIndexers())
|
|
||||||
.Returns(indexers);
|
|
||||||
|
|
||||||
mocker.GetMock<SeriesProvider>()
|
|
||||||
.Setup(c => c.GetSeries(It.IsAny<int>()))
|
|
||||||
.Returns(episode.Series);
|
|
||||||
|
|
||||||
mocker.GetMock<InventoryProvider>()
|
|
||||||
.Setup(c => c.IsQualityNeeded(It.IsAny<EpisodeParseResult>())).Returns(false);
|
|
||||||
|
|
||||||
mocker.GetMock<SceneMappingProvider>()
|
|
||||||
.Setup(s => s.GetSceneName(71256)).Returns("The Daily Show");
|
|
||||||
|
|
||||||
//Act
|
|
||||||
mocker.Resolve<SearchProvider>().EpisodeSearch(new ProgressNotification("Test"), episode.EpisodeId);
|
|
||||||
|
|
||||||
|
|
||||||
//Assert
|
|
||||||
mocker.VerifyAllMocks();
|
|
||||||
mocker.GetMock<InventoryProvider>().Verify(c => c.IsQualityNeeded(It.IsAny<EpisodeParseResult>()),
|
|
||||||
Times.Exactly(8));
|
|
||||||
ExceptionVerification.ExcpectedWarns(1);
|
|
||||||
indexer1.VerifyAll();
|
|
||||||
indexer2.VerifyAll();
|
|
||||||
}
|
|
||||||
|
|
||||||
[Test]
|
|
||||||
public void start_failed_indexer_should_not_break_job()
|
|
||||||
{
|
|
||||||
var parseResults = Builder<EpisodeParseResult>.CreateListOfSize(4)
|
|
||||||
.Build();
|
|
||||||
|
|
||||||
var episode = Builder<Episode>.CreateNew()
|
|
||||||
.With(c => c.Series = Builder<Series>.CreateNew().Build())
|
|
||||||
.With(c => c.SeasonNumber = 12)
|
|
||||||
.Build();
|
|
||||||
|
|
||||||
var mocker = new AutoMoqer();
|
|
||||||
|
|
||||||
mocker.GetMock<EpisodeProvider>()
|
|
||||||
.Setup(c => c.GetEpisode(episode.EpisodeId))
|
|
||||||
.Returns(episode);
|
|
||||||
|
|
||||||
var indexer1 = new Mock<IndexerBase>();
|
|
||||||
indexer1.Setup(c => c.FetchEpisode(episode.Series.Title, episode.SeasonNumber, episode.EpisodeNumber))
|
|
||||||
.Returns(parseResults).Verifiable();
|
|
||||||
|
|
||||||
|
|
||||||
var indexer2 = new Mock<IndexerBase>();
|
|
||||||
indexer2.Setup(c => c.FetchEpisode(episode.Series.Title, episode.SeasonNumber, episode.EpisodeNumber))
|
|
||||||
.Throws(new Exception()).Verifiable();
|
|
||||||
|
|
||||||
var indexer3 = new Mock<IndexerBase>();
|
|
||||||
indexer3.Setup(c => c.FetchEpisode(episode.Series.Title, episode.SeasonNumber, episode.EpisodeNumber))
|
|
||||||
.Returns(parseResults).Verifiable();
|
|
||||||
|
|
||||||
|
|
||||||
var indexers = new List<IndexerBase> { indexer1.Object, indexer2.Object, indexer3.Object };
|
|
||||||
|
|
||||||
mocker.GetMock<IndexerProvider>()
|
|
||||||
.Setup(c => c.GetEnabledIndexers())
|
|
||||||
.Returns(indexers);
|
|
||||||
|
|
||||||
mocker.GetMock<SeriesProvider>()
|
|
||||||
.Setup(c => c.GetSeries(It.IsAny<int>()))
|
|
||||||
.Returns(episode.Series);
|
|
||||||
|
|
||||||
mocker.GetMock<InventoryProvider>()
|
|
||||||
.Setup(c => c.IsQualityNeeded(It.IsAny<EpisodeParseResult>())).Returns(false);
|
|
||||||
|
|
||||||
mocker.GetMock<SceneMappingProvider>()
|
|
||||||
.Setup(s => s.GetSceneName(It.IsAny<int>())).Returns("");
|
|
||||||
|
|
||||||
//Act
|
|
||||||
mocker.Resolve<SearchProvider>().EpisodeSearch(new ProgressNotification("Test"), episode.EpisodeId);
|
|
||||||
|
|
||||||
|
|
||||||
//Assert
|
|
||||||
mocker.VerifyAllMocks();
|
|
||||||
mocker.GetMock<InventoryProvider>().Verify(c => c.IsQualityNeeded(It.IsAny<EpisodeParseResult>()),
|
|
||||||
Times.Exactly(8));
|
|
||||||
|
|
||||||
ExceptionVerification.ExcpectedWarns(1);
|
|
||||||
ExceptionVerification.ExcpectedErrors(1);
|
|
||||||
indexer1.VerifyAll();
|
|
||||||
indexer2.VerifyAll();
|
|
||||||
indexer3.VerifyAll();
|
|
||||||
}
|
|
||||||
|
|
||||||
[Test]
|
|
||||||
public void start_no_episode_found_should_return_with_error_logged()
|
|
||||||
{
|
|
||||||
var mocker = new AutoMoqer(MockBehavior.Strict);
|
|
||||||
|
|
||||||
mocker.GetMock<EpisodeProvider>()
|
|
||||||
.Setup(c => c.GetEpisode(It.IsAny<long>()))
|
|
||||||
.Returns<Episode>(null);
|
|
||||||
|
|
||||||
//Act
|
|
||||||
mocker.Resolve<SearchProvider>().EpisodeSearch(new ProgressNotification("Test"), 12);
|
|
||||||
|
|
||||||
|
|
||||||
//Assert
|
|
||||||
mocker.VerifyAllMocks();
|
|
||||||
ExceptionVerification.ExcpectedErrors(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
[Test]
|
|
||||||
public void episode_search_should_call_get_series()
|
|
||||||
{
|
|
||||||
var parseResults = Builder<EpisodeParseResult>.CreateListOfSize(4)
|
|
||||||
.Build();
|
|
||||||
|
|
||||||
var episode = Builder<Episode>.CreateNew()
|
|
||||||
.With(c => c.Series = Builder<Series>.CreateNew().Build())
|
|
||||||
.With(c => c.SeasonNumber = 12)
|
|
||||||
.Build();
|
|
||||||
|
|
||||||
var mocker = new AutoMoqer(MockBehavior.Strict);
|
|
||||||
|
|
||||||
mocker.GetMock<EpisodeProvider>()
|
|
||||||
.Setup(c => c.GetEpisode(episode.EpisodeId))
|
|
||||||
.Returns(episode);
|
|
||||||
|
|
||||||
var indexer1 = new Mock<IndexerBase>();
|
|
||||||
indexer1.Setup(c => c.FetchEpisode(episode.Series.Title, episode.SeasonNumber, episode.EpisodeNumber))
|
|
||||||
.Returns(parseResults).Verifiable();
|
|
||||||
|
|
||||||
var indexers = new List<IndexerBase> { indexer1.Object };
|
|
||||||
|
|
||||||
mocker.GetMock<IndexerProvider>()
|
|
||||||
.Setup(c => c.GetEnabledIndexers())
|
|
||||||
.Returns(indexers);
|
|
||||||
|
|
||||||
mocker.GetMock<InventoryProvider>()
|
|
||||||
.Setup(c => c.IsQualityNeeded(It.IsAny<EpisodeParseResult>())).Returns(false);
|
|
||||||
|
|
||||||
mocker.GetMock<SceneMappingProvider>()
|
|
||||||
.Setup(s => s.GetSceneName(It.IsAny<int>())).Returns("");
|
|
||||||
|
|
||||||
mocker.GetMock<SeriesProvider>()
|
|
||||||
.Setup(s => s.GetSeries(It.IsAny<int>())).Returns(episode.Series);
|
|
||||||
|
|
||||||
//Act
|
|
||||||
mocker.Resolve<SearchProvider>().EpisodeSearch(new ProgressNotification("Test"), episode.EpisodeId);
|
|
||||||
|
|
||||||
|
|
||||||
//Assert
|
|
||||||
mocker.VerifyAllMocks();
|
|
||||||
ExceptionVerification.ExcpectedWarns(1);
|
|
||||||
indexer1.VerifyAll();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,209 +0,0 @@
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
|
|
||||||
using FizzWare.NBuilder;
|
|
||||||
using FluentAssertions;
|
|
||||||
using Moq;
|
|
||||||
using NUnit.Framework;
|
|
||||||
using NzbDrone.Core.Model;
|
|
||||||
using NzbDrone.Core.Model.Notification;
|
|
||||||
using NzbDrone.Core.Providers;
|
|
||||||
using NzbDrone.Core.Providers.Indexer;
|
|
||||||
using NzbDrone.Core.Repository;
|
|
||||||
using NzbDrone.Core.Test.Framework;
|
|
||||||
using NzbDrone.Test.Common.AutoMoq;
|
|
||||||
|
|
||||||
namespace NzbDrone.Core.Test.ProviderTests
|
|
||||||
{
|
|
||||||
[TestFixture]
|
|
||||||
// ReSharper disable InconsistentNaming
|
|
||||||
public class SearchProviderTest_PartialSeason : CoreTest
|
|
||||||
{
|
|
||||||
[Test]
|
|
||||||
public void SeasonPartialSearch_season_success()
|
|
||||||
{
|
|
||||||
var series = Builder<Series>.CreateNew()
|
|
||||||
.With(s => s.SeriesId = 1)
|
|
||||||
.With(s => s.Title = "Title1")
|
|
||||||
.Build();
|
|
||||||
|
|
||||||
var episodes = Builder<Episode>.CreateListOfSize(5)
|
|
||||||
.All()
|
|
||||||
.With(e => e.Series = series)
|
|
||||||
.With(e => e.SeriesId = 1)
|
|
||||||
.With(e => e.SeasonNumber = 1)
|
|
||||||
.With(e => e.Ignored = false)
|
|
||||||
.Build();
|
|
||||||
|
|
||||||
var parseResults = Builder<EpisodeParseResult>.CreateListOfSize(4)
|
|
||||||
.All()
|
|
||||||
.With(e => e.EpisodeNumbers = Builder<int>.CreateListOfSize(2).Build().ToList())
|
|
||||||
.Build();
|
|
||||||
|
|
||||||
var mocker = new AutoMoqer(MockBehavior.Strict);
|
|
||||||
|
|
||||||
var notification = new ProgressNotification("Season Search");
|
|
||||||
|
|
||||||
var indexer1 = new Mock<IndexerBase>();
|
|
||||||
indexer1.Setup(c => c.FetchPartialSeason(episodes[0].Series.Title, episodes[0].SeasonNumber, 0))
|
|
||||||
.Returns(parseResults).Verifiable();
|
|
||||||
|
|
||||||
var indexer2 = new Mock<IndexerBase>();
|
|
||||||
indexer2.Setup(c => c.FetchPartialSeason(episodes[0].Series.Title, episodes[0].SeasonNumber, 0))
|
|
||||||
.Returns(parseResults).Verifiable();
|
|
||||||
|
|
||||||
var indexers = new List<IndexerBase> { indexer1.Object, indexer2.Object };
|
|
||||||
|
|
||||||
mocker.GetMock<IndexerProvider>()
|
|
||||||
.Setup(c => c.GetEnabledIndexers())
|
|
||||||
.Returns(indexers);
|
|
||||||
|
|
||||||
mocker.GetMock<SeriesProvider>()
|
|
||||||
.Setup(c => c.GetSeries(1)).Returns(series);
|
|
||||||
|
|
||||||
mocker.GetMock<EpisodeProvider>()
|
|
||||||
.Setup(c => c.GetEpisodesBySeason(1, 1)).Returns(episodes);
|
|
||||||
|
|
||||||
mocker.GetMock<SceneMappingProvider>()
|
|
||||||
.Setup(s => s.GetSceneName(1)).Returns(String.Empty);
|
|
||||||
|
|
||||||
mocker.GetMock<InventoryProvider>()
|
|
||||||
.Setup(s => s.IsQualityNeeded(It.IsAny<EpisodeParseResult>())).Returns(true);
|
|
||||||
|
|
||||||
mocker.GetMock<DownloadProvider>()
|
|
||||||
.Setup(s => s.DownloadReport(It.IsAny<EpisodeParseResult>())).Returns(true);
|
|
||||||
|
|
||||||
//Act
|
|
||||||
var result = mocker.Resolve<SearchProvider>().PartialSeasonSearch(notification, 1, 1);
|
|
||||||
|
|
||||||
//Assert
|
|
||||||
result.Should().HaveCount(16);
|
|
||||||
mocker.VerifyAllMocks();
|
|
||||||
mocker.GetMock<DownloadProvider>().Verify(c => c.DownloadReport(It.IsAny<EpisodeParseResult>()), Times.Exactly(8));
|
|
||||||
}
|
|
||||||
|
|
||||||
[Test]
|
|
||||||
public void SeasonPartialSearch_season_no_results()
|
|
||||||
{
|
|
||||||
var series = Builder<Series>.CreateNew()
|
|
||||||
.With(s => s.SeriesId = 1)
|
|
||||||
.With(s => s.Title = "Title1")
|
|
||||||
.Build();
|
|
||||||
|
|
||||||
var episodes = Builder<Episode>.CreateListOfSize(5)
|
|
||||||
.All()
|
|
||||||
.With(e => e.Series = series)
|
|
||||||
.With(e => e.SeriesId = 1)
|
|
||||||
.With(e => e.SeasonNumber = 1)
|
|
||||||
.With(e => e.Ignored = false)
|
|
||||||
.Build();
|
|
||||||
|
|
||||||
var parseResults = Builder<EpisodeParseResult>.CreateListOfSize(4)
|
|
||||||
.All()
|
|
||||||
.With(e => e.EpisodeNumbers = Builder<int>.CreateListOfSize(2).Build().ToList())
|
|
||||||
.Build();
|
|
||||||
|
|
||||||
var mocker = new AutoMoqer(MockBehavior.Strict);
|
|
||||||
|
|
||||||
var notification = new ProgressNotification("Season Search");
|
|
||||||
|
|
||||||
var indexer1 = new Mock<IndexerBase>();
|
|
||||||
indexer1.Setup(c => c.FetchPartialSeason(episodes[0].Series.Title, episodes[0].SeasonNumber, 0))
|
|
||||||
.Returns(new List<EpisodeParseResult>()).Verifiable();
|
|
||||||
|
|
||||||
var indexer2 = new Mock<IndexerBase>();
|
|
||||||
indexer2.Setup(c => c.FetchPartialSeason(episodes[0].Series.Title, episodes[0].SeasonNumber, 0))
|
|
||||||
.Returns(new List<EpisodeParseResult>()).Verifiable();
|
|
||||||
|
|
||||||
var indexers = new List<IndexerBase> { indexer1.Object, indexer2.Object };
|
|
||||||
|
|
||||||
mocker.GetMock<IndexerProvider>()
|
|
||||||
.Setup(c => c.GetEnabledIndexers())
|
|
||||||
.Returns(indexers);
|
|
||||||
|
|
||||||
mocker.GetMock<SeriesProvider>()
|
|
||||||
.Setup(c => c.GetSeries(1)).Returns(series);
|
|
||||||
|
|
||||||
mocker.GetMock<EpisodeProvider>()
|
|
||||||
.Setup(c => c.GetEpisodesBySeason(1, 1)).Returns(episodes);
|
|
||||||
|
|
||||||
mocker.GetMock<SceneMappingProvider>()
|
|
||||||
.Setup(s => s.GetSceneName(1)).Returns(String.Empty);
|
|
||||||
|
|
||||||
//Act
|
|
||||||
var result = mocker.Resolve<SearchProvider>().PartialSeasonSearch(notification, 1, 1);
|
|
||||||
|
|
||||||
//Assert
|
|
||||||
result.Should().HaveCount(0);
|
|
||||||
mocker.VerifyAllMocks();
|
|
||||||
mocker.GetMock<DownloadProvider>().Verify(c => c.DownloadReport(It.IsAny<EpisodeParseResult>()), Times.Never());
|
|
||||||
}
|
|
||||||
|
|
||||||
[Test]
|
|
||||||
public void ProcessPartialSeasonSearchResults_success()
|
|
||||||
{
|
|
||||||
var series = Builder<Series>.CreateNew()
|
|
||||||
.With(s => s.SeriesId = 1)
|
|
||||||
.With(s => s.Title = "Title1")
|
|
||||||
.Build();
|
|
||||||
|
|
||||||
var parseResults = Builder<EpisodeParseResult>.CreateListOfSize(4)
|
|
||||||
.All()
|
|
||||||
.With(e => e.EpisodeNumbers = Builder<int>.CreateListOfSize(2).Build().ToList())
|
|
||||||
.With(e => e.Series = series)
|
|
||||||
.Build();
|
|
||||||
|
|
||||||
var mocker = new AutoMoqer(MockBehavior.Strict);
|
|
||||||
|
|
||||||
var notification = new ProgressNotification("Season Search");
|
|
||||||
|
|
||||||
mocker.GetMock<InventoryProvider>()
|
|
||||||
.Setup(s => s.IsQualityNeeded(It.IsAny<EpisodeParseResult>())).Returns(true);
|
|
||||||
|
|
||||||
mocker.GetMock<DownloadProvider>()
|
|
||||||
.Setup(s => s.DownloadReport(It.IsAny<EpisodeParseResult>())).Returns(true);
|
|
||||||
|
|
||||||
//Act
|
|
||||||
var result = mocker.Resolve<SearchProvider>().ProcessPartialSeasonSearchResults(notification, parseResults);
|
|
||||||
|
|
||||||
//Assert
|
|
||||||
result.Should().HaveCount(8);
|
|
||||||
mocker.VerifyAllMocks();
|
|
||||||
mocker.GetMock<DownloadProvider>().Verify(c => c.DownloadReport(It.IsAny<EpisodeParseResult>()), Times.Exactly(4));
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
[Test]
|
|
||||||
public void ProcessPartialSeasonSearchResults_failure()
|
|
||||||
{
|
|
||||||
var series = Builder<Series>.CreateNew()
|
|
||||||
.With(s => s.SeriesId = 1)
|
|
||||||
.With(s => s.Title = "Title1")
|
|
||||||
.Build();
|
|
||||||
|
|
||||||
var parseResults = Builder<EpisodeParseResult>.CreateListOfSize(4)
|
|
||||||
.TheFirst(1)
|
|
||||||
.With(p => p.CleanTitle = "title")
|
|
||||||
.With(p => p.SeasonNumber = 1)
|
|
||||||
.With(p => p.FullSeason = true)
|
|
||||||
.With(p => p.EpisodeNumbers = null)
|
|
||||||
.Build();
|
|
||||||
|
|
||||||
var mocker = new AutoMoqer(MockBehavior.Strict);
|
|
||||||
|
|
||||||
var notification = new ProgressNotification("Season Search");
|
|
||||||
|
|
||||||
mocker.GetMock<InventoryProvider>()
|
|
||||||
.Setup(s => s.IsQualityNeeded(It.IsAny<EpisodeParseResult>())).Returns(false);
|
|
||||||
|
|
||||||
//Act
|
|
||||||
var result = mocker.Resolve<SearchProvider>().ProcessPartialSeasonSearchResults(notification, parseResults);
|
|
||||||
|
|
||||||
//Assert
|
|
||||||
result.Should().HaveCount(0);
|
|
||||||
mocker.VerifyAllMocks();
|
|
||||||
mocker.GetMock<DownloadProvider>().Verify(c => c.DownloadReport(It.IsAny<EpisodeParseResult>()), Times.Never());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,210 +0,0 @@
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
|
|
||||||
using FizzWare.NBuilder;
|
|
||||||
using FluentAssertions;
|
|
||||||
using Moq;
|
|
||||||
using NUnit.Framework;
|
|
||||||
using NzbDrone.Core.Model;
|
|
||||||
using NzbDrone.Core.Model.Notification;
|
|
||||||
using NzbDrone.Core.Providers;
|
|
||||||
using NzbDrone.Core.Providers.Indexer;
|
|
||||||
using NzbDrone.Core.Repository;
|
|
||||||
using NzbDrone.Core.Test.Framework;
|
|
||||||
using NzbDrone.Test.Common;
|
|
||||||
using NzbDrone.Test.Common.AutoMoq;
|
|
||||||
|
|
||||||
namespace NzbDrone.Core.Test.ProviderTests
|
|
||||||
{
|
|
||||||
[TestFixture]
|
|
||||||
// ReSharper disable InconsistentNaming
|
|
||||||
public class SearchProviderTest_Season : CoreTest
|
|
||||||
{
|
|
||||||
[Test]
|
|
||||||
public void SeasonSearch_season_success()
|
|
||||||
{
|
|
||||||
var series = Builder<Series>.CreateNew()
|
|
||||||
.With(s => s.SeriesId = 1)
|
|
||||||
.With(s => s.Title = "Title1")
|
|
||||||
.Build();
|
|
||||||
|
|
||||||
var episodes = Builder<Episode>.CreateListOfSize(5)
|
|
||||||
.All()
|
|
||||||
.With(e => e.Series = series)
|
|
||||||
.With(e => e.SeriesId = 1)
|
|
||||||
.With(e => e.SeasonNumber = 1)
|
|
||||||
.With(e => e.Ignored = false)
|
|
||||||
.Build();
|
|
||||||
|
|
||||||
var parseResults = Builder<EpisodeParseResult>.CreateListOfSize(4)
|
|
||||||
.TheFirst(1)
|
|
||||||
.With(p => p.CleanTitle = "title")
|
|
||||||
.With(p => p.SeasonNumber = 1)
|
|
||||||
.With(p => p.FullSeason = true)
|
|
||||||
.With(p => p.EpisodeNumbers = null)
|
|
||||||
.Build();
|
|
||||||
|
|
||||||
var mocker = new AutoMoqer(MockBehavior.Strict);
|
|
||||||
|
|
||||||
var notification = new ProgressNotification("Season Search");
|
|
||||||
|
|
||||||
var indexer1 = new Mock<IndexerBase>();
|
|
||||||
indexer1.Setup(c => c.FetchSeason(episodes[0].Series.Title, episodes[0].SeasonNumber))
|
|
||||||
.Returns(parseResults).Verifiable();
|
|
||||||
|
|
||||||
var indexer2 = new Mock<IndexerBase>();
|
|
||||||
indexer2.Setup(c => c.FetchSeason(episodes[0].Series.Title, episodes[0].SeasonNumber))
|
|
||||||
.Returns(parseResults).Verifiable();
|
|
||||||
|
|
||||||
var indexers = new List<IndexerBase> { indexer1.Object, indexer2.Object };
|
|
||||||
|
|
||||||
mocker.GetMock<IndexerProvider>()
|
|
||||||
.Setup(c => c.GetEnabledIndexers())
|
|
||||||
.Returns(indexers);
|
|
||||||
|
|
||||||
mocker.GetMock<SeriesProvider>()
|
|
||||||
.Setup(c => c.GetSeries(1)).Returns(series);
|
|
||||||
|
|
||||||
mocker.GetMock<EpisodeProvider>()
|
|
||||||
.Setup(c => c.GetEpisodeNumbersBySeason(1, 1)).Returns(episodes.Select(e => e.EpisodeNumber).ToList());
|
|
||||||
|
|
||||||
mocker.GetMock<SceneMappingProvider>()
|
|
||||||
.Setup(s => s.GetSceneName(1)).Returns(String.Empty);
|
|
||||||
|
|
||||||
mocker.GetMock<InventoryProvider>()
|
|
||||||
.Setup(s => s.IsQualityNeeded(It.IsAny<EpisodeParseResult>())).Returns(true);
|
|
||||||
|
|
||||||
mocker.GetMock<DownloadProvider>()
|
|
||||||
.Setup(s => s.DownloadReport(It.IsAny<EpisodeParseResult>())).Returns(true);
|
|
||||||
|
|
||||||
//Act
|
|
||||||
var result = mocker.Resolve<SearchProvider>().SeasonSearch(notification, 1, 1);
|
|
||||||
|
|
||||||
//Assert
|
|
||||||
result.Should().BeTrue();
|
|
||||||
mocker.VerifyAllMocks();
|
|
||||||
}
|
|
||||||
|
|
||||||
[Test]
|
|
||||||
public void SeasonSearch_season_failure()
|
|
||||||
{
|
|
||||||
var series = Builder<Series>.CreateNew()
|
|
||||||
.With(s => s.SeriesId = 1)
|
|
||||||
.With(s => s.Title = "Title1")
|
|
||||||
.Build();
|
|
||||||
|
|
||||||
var episodes = Builder<Episode>.CreateListOfSize(5)
|
|
||||||
.All()
|
|
||||||
.With(e => e.Series = series)
|
|
||||||
.With(e => e.SeriesId = 1)
|
|
||||||
.With(e => e.SeasonNumber = 1)
|
|
||||||
.With(e => e.Ignored = false)
|
|
||||||
.Build();
|
|
||||||
|
|
||||||
var parseResults = Builder<EpisodeParseResult>.CreateListOfSize(4)
|
|
||||||
.Build();
|
|
||||||
|
|
||||||
var mocker = new AutoMoqer(MockBehavior.Strict);
|
|
||||||
|
|
||||||
var notification = new ProgressNotification("Season Search");
|
|
||||||
|
|
||||||
var indexer1 = new Mock<IndexerBase>();
|
|
||||||
indexer1.Setup(c => c.FetchSeason(episodes[0].Series.Title, episodes[0].SeasonNumber))
|
|
||||||
.Returns(parseResults).Verifiable();
|
|
||||||
|
|
||||||
var indexer2 = new Mock<IndexerBase>();
|
|
||||||
indexer2.Setup(c => c.FetchSeason(episodes[0].Series.Title, episodes[0].SeasonNumber))
|
|
||||||
.Returns(parseResults).Verifiable();
|
|
||||||
|
|
||||||
var indexers = new List<IndexerBase> { indexer1.Object, indexer2.Object };
|
|
||||||
|
|
||||||
mocker.GetMock<IndexerProvider>()
|
|
||||||
.Setup(c => c.GetEnabledIndexers())
|
|
||||||
.Returns(indexers);
|
|
||||||
|
|
||||||
mocker.GetMock<SeriesProvider>()
|
|
||||||
.Setup(c => c.GetSeries(1)).Returns(series);
|
|
||||||
|
|
||||||
mocker.GetMock<EpisodeProvider>()
|
|
||||||
.Setup(c => c.GetEpisodeNumbersBySeason(1, 1)).Returns(episodes.Select(e => e.EpisodeNumber).ToList());
|
|
||||||
|
|
||||||
mocker.GetMock<SceneMappingProvider>()
|
|
||||||
.Setup(s => s.GetSceneName(1)).Returns(String.Empty);
|
|
||||||
|
|
||||||
//Act
|
|
||||||
var result = mocker.Resolve<SearchProvider>().SeasonSearch(notification, 1, 1);
|
|
||||||
|
|
||||||
//Assert
|
|
||||||
ExceptionVerification.ExcpectedWarns(1);
|
|
||||||
result.Should().BeFalse();
|
|
||||||
mocker.VerifyAllMocks();
|
|
||||||
}
|
|
||||||
|
|
||||||
[Test]
|
|
||||||
public void ProcessSeasonSearchResults_success()
|
|
||||||
{
|
|
||||||
var series = Builder<Series>.CreateNew()
|
|
||||||
.With(s => s.SeriesId = 1)
|
|
||||||
.With(s => s.Title = "Title1")
|
|
||||||
.Build();
|
|
||||||
|
|
||||||
var parseResults = Builder<EpisodeParseResult>.CreateListOfSize(4)
|
|
||||||
.TheFirst(1)
|
|
||||||
.With(p => p.CleanTitle = "title")
|
|
||||||
.With(p => p.SeasonNumber = 1)
|
|
||||||
.With(p => p.FullSeason = true)
|
|
||||||
.With(p => p.EpisodeNumbers = null)
|
|
||||||
.Build();
|
|
||||||
|
|
||||||
var mocker = new AutoMoqer(MockBehavior.Strict);
|
|
||||||
|
|
||||||
var notification = new ProgressNotification("Season Search");
|
|
||||||
|
|
||||||
mocker.GetMock<InventoryProvider>()
|
|
||||||
.Setup(s => s.IsQualityNeeded(It.IsAny<EpisodeParseResult>())).Returns(true);
|
|
||||||
|
|
||||||
mocker.GetMock<DownloadProvider>()
|
|
||||||
.Setup(s => s.DownloadReport(It.IsAny<EpisodeParseResult>())).Returns(true);
|
|
||||||
|
|
||||||
//Act
|
|
||||||
var result = mocker.Resolve<SearchProvider>().ProcessSeasonSearchResults(notification, series, 1, parseResults);
|
|
||||||
|
|
||||||
//Assert
|
|
||||||
result.Should().BeTrue();
|
|
||||||
mocker.VerifyAllMocks();
|
|
||||||
}
|
|
||||||
|
|
||||||
[Test]
|
|
||||||
public void ProcessSeasonSearchResults_failure()
|
|
||||||
{
|
|
||||||
var series = Builder<Series>.CreateNew()
|
|
||||||
.With(s => s.SeriesId = 1)
|
|
||||||
.With(s => s.Title = "Title1")
|
|
||||||
.Build();
|
|
||||||
|
|
||||||
var parseResults = Builder<EpisodeParseResult>.CreateListOfSize(4)
|
|
||||||
.TheFirst(1)
|
|
||||||
.With(p => p.CleanTitle = "title")
|
|
||||||
.With(p => p.SeasonNumber = 1)
|
|
||||||
.With(p => p.FullSeason = true)
|
|
||||||
.With(p => p.EpisodeNumbers = null)
|
|
||||||
.Build();
|
|
||||||
|
|
||||||
var mocker = new AutoMoqer(MockBehavior.Strict);
|
|
||||||
|
|
||||||
var notification = new ProgressNotification("Season Search");
|
|
||||||
|
|
||||||
mocker.GetMock<InventoryProvider>()
|
|
||||||
.Setup(s => s.IsQualityNeeded(It.IsAny<EpisodeParseResult>())).Returns(false);
|
|
||||||
|
|
||||||
//Act
|
|
||||||
var result = mocker.Resolve<SearchProvider>().ProcessSeasonSearchResults(notification, series, 1, parseResults);
|
|
||||||
|
|
||||||
//Assert
|
|
||||||
result.Should().BeFalse();
|
|
||||||
ExceptionVerification.ExcpectedWarns(1);
|
|
||||||
mocker.VerifyAllMocks();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -0,0 +1,264 @@
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using FizzWare.NBuilder;
|
||||||
|
using FluentAssertions;
|
||||||
|
using Moq;
|
||||||
|
using NUnit.Framework;
|
||||||
|
using NzbDrone.Core.Model;
|
||||||
|
using NzbDrone.Core.Providers;
|
||||||
|
using NzbDrone.Core.Providers.Indexer;
|
||||||
|
using NzbDrone.Core.Repository;
|
||||||
|
using NzbDrone.Core.Test.Framework;
|
||||||
|
using NzbDrone.Test.Common;
|
||||||
|
|
||||||
|
namespace NzbDrone.Core.Test.ProviderTests.SearchProviderTests
|
||||||
|
{
|
||||||
|
public class PerformSearchFixture : CoreTest
|
||||||
|
{
|
||||||
|
private const string SCENE_NAME = "Scene Name";
|
||||||
|
private const int SEASON_NUMBER = 5;
|
||||||
|
private const int PARSE_RESULT_COUNT = 10;
|
||||||
|
|
||||||
|
private Mock<IndexerBase> _episodeIndexer1;
|
||||||
|
private Mock<IndexerBase> _episodeIndexer2;
|
||||||
|
private Mock<IndexerBase> _brokenIndexer;
|
||||||
|
private Mock<IndexerBase> _nullIndexer;
|
||||||
|
|
||||||
|
private List<IndexerBase> _indexers;
|
||||||
|
|
||||||
|
private Series _series;
|
||||||
|
private IList<Episode> _episodes;
|
||||||
|
|
||||||
|
[SetUp]
|
||||||
|
public void Setup()
|
||||||
|
{
|
||||||
|
var parseResults = Builder<EpisodeParseResult>.CreateListOfSize(PARSE_RESULT_COUNT)
|
||||||
|
.Build();
|
||||||
|
|
||||||
|
_series = Builder<Series>.CreateNew()
|
||||||
|
.Build();
|
||||||
|
|
||||||
|
_episodes = Builder<Episode>.CreateListOfSize(1)
|
||||||
|
.Build();
|
||||||
|
|
||||||
|
BuildIndexers(parseResults);
|
||||||
|
|
||||||
|
_indexers = new List<IndexerBase> { _episodeIndexer1.Object, _episodeIndexer2.Object };
|
||||||
|
|
||||||
|
Mocker.GetMock<IndexerProvider>()
|
||||||
|
.Setup(c => c.GetEnabledIndexers())
|
||||||
|
.Returns(_indexers);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void BuildIndexers(IList<EpisodeParseResult> parseResults)
|
||||||
|
{
|
||||||
|
_episodeIndexer1 = new Mock<IndexerBase>();
|
||||||
|
_episodeIndexer1.Setup(c => c.FetchEpisode(It.IsAny<string>(), It.IsAny<int>(), It.IsAny<int>()))
|
||||||
|
.Returns(parseResults);
|
||||||
|
_episodeIndexer1.Setup(c => c.FetchSeason(It.IsAny<string>(), It.IsAny<int>()))
|
||||||
|
.Returns(parseResults);
|
||||||
|
_episodeIndexer1.Setup(c => c.FetchPartialSeason(It.IsAny<string>(), It.IsAny<int>(), It.IsAny<int>()))
|
||||||
|
.Returns(parseResults);
|
||||||
|
|
||||||
|
|
||||||
|
_episodeIndexer2 = new Mock<IndexerBase>();
|
||||||
|
_episodeIndexer2.Setup(c => c.FetchEpisode(It.IsAny<string>(), It.IsAny<int>(), It.IsAny<int>()))
|
||||||
|
.Returns(parseResults);
|
||||||
|
_episodeIndexer2.Setup(c => c.FetchSeason(It.IsAny<string>(), It.IsAny<int>()))
|
||||||
|
.Returns(parseResults);
|
||||||
|
_episodeIndexer2.Setup(c => c.FetchPartialSeason(It.IsAny<string>(), It.IsAny<int>(), It.IsAny<int>()))
|
||||||
|
.Returns(parseResults);
|
||||||
|
|
||||||
|
_brokenIndexer = new Mock<IndexerBase>();
|
||||||
|
_brokenIndexer.Setup(c => c.FetchEpisode(It.IsAny<string>(), It.IsAny<int>(), It.IsAny<int>()))
|
||||||
|
.Throws(new Exception());
|
||||||
|
|
||||||
|
_nullIndexer = new Mock<IndexerBase>();
|
||||||
|
_nullIndexer.Setup(c => c.FetchEpisode(It.IsAny<string>(), It.IsAny<int>(), It.IsAny<int>()))
|
||||||
|
.Returns<List<EpisodeParseResult>>(null);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void WithTwoGoodOneBrokenIndexer()
|
||||||
|
{
|
||||||
|
_indexers = new List<IndexerBase> { _episodeIndexer1.Object, _brokenIndexer.Object, _episodeIndexer2.Object };
|
||||||
|
|
||||||
|
Mocker.GetMock<IndexerProvider>()
|
||||||
|
.Setup(c => c.GetEnabledIndexers())
|
||||||
|
.Returns(_indexers);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void WithNullIndexers()
|
||||||
|
{
|
||||||
|
_indexers = new List<IndexerBase> { _nullIndexer.Object, _nullIndexer.Object };
|
||||||
|
|
||||||
|
Mocker.GetMock<IndexerProvider>()
|
||||||
|
.Setup(c => c.GetEnabledIndexers())
|
||||||
|
.Returns(_indexers);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void WithSceneName()
|
||||||
|
{
|
||||||
|
Mocker.GetMock<SceneMappingProvider>()
|
||||||
|
.Setup(s => s.GetSceneName(_series.SeriesId)).Returns(SCENE_NAME);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void With30Episodes()
|
||||||
|
{
|
||||||
|
_episodes = Builder<Episode>.CreateListOfSize(30)
|
||||||
|
.Build();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void WithNullEpisodes()
|
||||||
|
{
|
||||||
|
_episodes = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void VerifyFetchEpisode(Times times)
|
||||||
|
{
|
||||||
|
_episodeIndexer1.Verify(v => v.FetchEpisode(_series.Title, SEASON_NUMBER, It.IsAny<int>())
|
||||||
|
, times);
|
||||||
|
|
||||||
|
_episodeIndexer2.Verify(v => v.FetchEpisode(_series.Title, SEASON_NUMBER, It.IsAny<int>())
|
||||||
|
, times);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void VerifyFetchEpisodeWithSceneName(Times times)
|
||||||
|
{
|
||||||
|
_episodeIndexer1.Verify(v => v.FetchEpisode(SCENE_NAME, SEASON_NUMBER, It.IsAny<int>())
|
||||||
|
, times);
|
||||||
|
|
||||||
|
_episodeIndexer2.Verify(v => v.FetchEpisode(SCENE_NAME, SEASON_NUMBER, It.IsAny<int>())
|
||||||
|
, times);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void VerifyFetchEpisodeBrokenIndexer(Times times)
|
||||||
|
{
|
||||||
|
_brokenIndexer.Verify(v => v.FetchEpisode(It.IsAny<string>(), SEASON_NUMBER, It.IsAny<int>())
|
||||||
|
, times);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void VerifyFetchPartialSeason(Times times)
|
||||||
|
{
|
||||||
|
_episodeIndexer1.Verify(v => v.FetchPartialSeason(_series.Title, SEASON_NUMBER, It.IsAny<int>())
|
||||||
|
, times);
|
||||||
|
|
||||||
|
_episodeIndexer2.Verify(v => v.FetchPartialSeason(_series.Title, SEASON_NUMBER, It.IsAny<int>())
|
||||||
|
, times);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void VerifyFetchSeason(Times times)
|
||||||
|
{
|
||||||
|
_episodeIndexer1.Verify(v => v.FetchSeason(_series.Title, SEASON_NUMBER), times);
|
||||||
|
_episodeIndexer1.Verify(v => v.FetchSeason(_series.Title, SEASON_NUMBER), times);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void PerformSearch_should_search_all_enabled_providers()
|
||||||
|
{
|
||||||
|
//Act
|
||||||
|
var result = Mocker.Resolve<SearchProvider>().PerformSearch(MockNotification, _series, SEASON_NUMBER, _episodes);
|
||||||
|
|
||||||
|
//Assert
|
||||||
|
VerifyFetchEpisode(Times.Once());
|
||||||
|
result.Should().HaveCount(PARSE_RESULT_COUNT * 2);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void PerformSearch_should_look_for_scene_name_to_search()
|
||||||
|
{
|
||||||
|
WithSceneName();
|
||||||
|
|
||||||
|
//Act
|
||||||
|
Mocker.Resolve<SearchProvider>().PerformSearch(MockNotification, _series, 1, _episodes);
|
||||||
|
|
||||||
|
//Assert
|
||||||
|
Mocker.GetMock<SceneMappingProvider>().Verify(c => c.GetSceneName(_series.SeriesId),
|
||||||
|
Times.Once());
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void broken_indexer_should_not_block_other_indexers()
|
||||||
|
{
|
||||||
|
//Setup
|
||||||
|
WithTwoGoodOneBrokenIndexer();
|
||||||
|
|
||||||
|
//Act
|
||||||
|
var result = Mocker.Resolve<SearchProvider>().PerformSearch(MockNotification, _series, SEASON_NUMBER, _episodes);
|
||||||
|
|
||||||
|
//Assert
|
||||||
|
result.Should().HaveCount(PARSE_RESULT_COUNT * 2);
|
||||||
|
|
||||||
|
VerifyFetchEpisode(Times.Once());
|
||||||
|
VerifyFetchEpisodeBrokenIndexer(Times.Once());
|
||||||
|
|
||||||
|
Mocker.GetMock<SceneMappingProvider>().Verify(c => c.GetSceneName(_series.SeriesId),
|
||||||
|
Times.Once());
|
||||||
|
|
||||||
|
ExceptionVerification.ExcpectedErrors(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void PerformSearch_for_episode_should_call_FetchEpisode()
|
||||||
|
{
|
||||||
|
//Act
|
||||||
|
var result = Mocker.Resolve<SearchProvider>().PerformSearch(MockNotification, _series, SEASON_NUMBER, _episodes);
|
||||||
|
|
||||||
|
//Assert
|
||||||
|
result.Should().HaveCount(PARSE_RESULT_COUNT * 2);
|
||||||
|
|
||||||
|
VerifyFetchEpisode(Times.Once());
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void PerformSearch_for_partial_season_should_call_FetchPartialSeason()
|
||||||
|
{
|
||||||
|
With30Episodes();
|
||||||
|
|
||||||
|
//Act
|
||||||
|
var result = Mocker.Resolve<SearchProvider>().PerformSearch(MockNotification, _series, SEASON_NUMBER, _episodes);
|
||||||
|
|
||||||
|
//Assert
|
||||||
|
result.Should().HaveCount(80);
|
||||||
|
VerifyFetchPartialSeason(Times.Exactly(4));
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void PerformSearch_for_season_should_call_FetchSeason()
|
||||||
|
{
|
||||||
|
WithNullEpisodes();
|
||||||
|
|
||||||
|
//Act
|
||||||
|
var result = Mocker.Resolve<SearchProvider>().PerformSearch(MockNotification, _series, SEASON_NUMBER, _episodes);
|
||||||
|
|
||||||
|
//Assert
|
||||||
|
result.Should().HaveCount(20);
|
||||||
|
VerifyFetchSeason(Times.Once());
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void PerformSearch_should_return_empty_list_when_results_from_indexers_are_null()
|
||||||
|
{
|
||||||
|
//Setup
|
||||||
|
WithNullIndexers();
|
||||||
|
|
||||||
|
//Act
|
||||||
|
var result = Mocker.Resolve<SearchProvider>().PerformSearch(MockNotification, _series, SEASON_NUMBER, _episodes);
|
||||||
|
|
||||||
|
//Assert
|
||||||
|
result.Should().HaveCount(0);
|
||||||
|
ExceptionVerification.ExcpectedErrors(2);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void should_use_scene_name_to_search_for_episode_when_avilable()
|
||||||
|
{
|
||||||
|
WithSceneName();
|
||||||
|
|
||||||
|
Mocker.Resolve<SearchProvider>().PerformSearch(MockNotification, _series, SEASON_NUMBER, _episodes);
|
||||||
|
|
||||||
|
VerifyFetchEpisodeWithSceneName(Times.Once());
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,289 @@
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
|
||||||
|
using FizzWare.NBuilder;
|
||||||
|
using FluentAssertions;
|
||||||
|
using Moq;
|
||||||
|
using NUnit.Framework;
|
||||||
|
using NzbDrone.Core.Model;
|
||||||
|
using NzbDrone.Core.Model.Notification;
|
||||||
|
using NzbDrone.Core.Providers;
|
||||||
|
using NzbDrone.Core.Providers.Indexer;
|
||||||
|
using NzbDrone.Core.Repository;
|
||||||
|
using NzbDrone.Core.Repository.Quality;
|
||||||
|
using NzbDrone.Core.Test.Framework;
|
||||||
|
using NzbDrone.Test.Common;
|
||||||
|
using NzbDrone.Test.Common.AutoMoq;
|
||||||
|
|
||||||
|
namespace NzbDrone.Core.Test.ProviderTests.SearchProviderTests
|
||||||
|
{
|
||||||
|
[TestFixture]
|
||||||
|
// ReSharper disable InconsistentNaming
|
||||||
|
public class ProcessSearchResultsFixture : CoreTest
|
||||||
|
{
|
||||||
|
private Series _matchingSeries = null;
|
||||||
|
private Series _mismatchedSeries = null;
|
||||||
|
private Series _nullSeries = null;
|
||||||
|
|
||||||
|
[SetUp]
|
||||||
|
public void setup()
|
||||||
|
{
|
||||||
|
_matchingSeries = Builder<Series>.CreateNew()
|
||||||
|
.With(s => s.SeriesId = 79488)
|
||||||
|
.With(s => s.Title = "30 Rock")
|
||||||
|
.Build();
|
||||||
|
|
||||||
|
_mismatchedSeries = Builder<Series>.CreateNew()
|
||||||
|
.With(s => s.SeriesId = 12345)
|
||||||
|
.With(s => s.Title = "Not 30 Rock")
|
||||||
|
.Build();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void WithMatchingSeries()
|
||||||
|
{
|
||||||
|
Mocker.GetMock<SeriesProvider>()
|
||||||
|
.Setup(s => s.FindSeries(It.IsAny<string>())).Returns(_matchingSeries);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void WithMisMatchedSeries()
|
||||||
|
{
|
||||||
|
Mocker.GetMock<SeriesProvider>()
|
||||||
|
.Setup(s => s.FindSeries(It.IsAny<string>())).Returns(_mismatchedSeries);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void WithNullSeries()
|
||||||
|
{
|
||||||
|
Mocker.GetMock<SeriesProvider>()
|
||||||
|
.Setup(s => s.FindSeries(It.IsAny<string>())).Returns(_nullSeries);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void WithSuccessfulDownload()
|
||||||
|
{
|
||||||
|
Mocker.GetMock<DownloadProvider>()
|
||||||
|
.Setup(s => s.DownloadReport(It.IsAny<EpisodeParseResult>()))
|
||||||
|
.Returns(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void WithFailingDownload()
|
||||||
|
{
|
||||||
|
Mocker.GetMock<DownloadProvider>()
|
||||||
|
.Setup(s => s.DownloadReport(It.IsAny<EpisodeParseResult>()))
|
||||||
|
.Returns(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void WithQualityNeeded()
|
||||||
|
{
|
||||||
|
Mocker.GetMock<InventoryProvider>()
|
||||||
|
.Setup(s => s.IsQualityNeeded(It.IsAny<EpisodeParseResult>()))
|
||||||
|
.Returns(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void WithQualityNotNeeded()
|
||||||
|
{
|
||||||
|
Mocker.GetMock<InventoryProvider>()
|
||||||
|
.Setup(s => s.IsQualityNeeded(It.IsAny<EpisodeParseResult>()))
|
||||||
|
.Returns(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void processSearchResults_higher_quality_should_be_called_first()
|
||||||
|
{
|
||||||
|
var parseResults = Builder<EpisodeParseResult>.CreateListOfSize(5)
|
||||||
|
.All()
|
||||||
|
.With(e => e.SeasonNumber = 1)
|
||||||
|
.With(e => e.EpisodeNumbers = new List<int> { 1 })
|
||||||
|
.With(c => c.Quality = new Quality(QualityTypes.DVD, true))
|
||||||
|
.Random(1)
|
||||||
|
.With(c => c.Quality = new Quality(QualityTypes.Bluray1080p, true))
|
||||||
|
.Build();
|
||||||
|
|
||||||
|
WithMatchingSeries();
|
||||||
|
WithSuccessfulDownload();
|
||||||
|
|
||||||
|
Mocker.GetMock<InventoryProvider>()
|
||||||
|
.Setup(s => s.IsQualityNeeded(It.Is<EpisodeParseResult>(d => d.Quality.QualityType == QualityTypes.Bluray1080p)))
|
||||||
|
.Returns(true);
|
||||||
|
|
||||||
|
//Act
|
||||||
|
var result = Mocker.Resolve<SearchProvider>().ProcessSearchResults(new ProgressNotification("Test"), parseResults, _matchingSeries, 1, 1);
|
||||||
|
|
||||||
|
//Assert
|
||||||
|
result.Should().HaveCount(1);
|
||||||
|
result.First().Should().Be(1);
|
||||||
|
|
||||||
|
Mocker.GetMock<InventoryProvider>().Verify(c => c.IsQualityNeeded(It.IsAny<EpisodeParseResult>()),
|
||||||
|
Times.Once());
|
||||||
|
Mocker.GetMock<DownloadProvider>().Verify(c => c.DownloadReport(It.IsAny<EpisodeParseResult>()),
|
||||||
|
Times.Once());
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void processSearchResults_when_quality_is_not_needed_should_check_the_rest()
|
||||||
|
{
|
||||||
|
var parseResults = Builder<EpisodeParseResult>.CreateListOfSize(5)
|
||||||
|
.All()
|
||||||
|
.With(e => e.SeasonNumber = 1)
|
||||||
|
.With(e => e.EpisodeNumbers = new List<int> { 1 })
|
||||||
|
.With(c => c.Quality = new Quality(QualityTypes.DVD, true))
|
||||||
|
.Build();
|
||||||
|
|
||||||
|
WithMatchingSeries();
|
||||||
|
WithQualityNotNeeded();
|
||||||
|
|
||||||
|
//Act
|
||||||
|
var result = Mocker.Resolve<SearchProvider>().ProcessSearchResults(new ProgressNotification("Test"), parseResults, _matchingSeries, 1, 1);
|
||||||
|
|
||||||
|
//Assert
|
||||||
|
result.Should().HaveCount(0);
|
||||||
|
|
||||||
|
Mocker.GetMock<InventoryProvider>().Verify(c => c.IsQualityNeeded(It.IsAny<EpisodeParseResult>()),
|
||||||
|
Times.Exactly(5));
|
||||||
|
Mocker.GetMock<DownloadProvider>().Verify(c => c.DownloadReport(It.IsAny<EpisodeParseResult>()),
|
||||||
|
Times.Never());
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void processSearchResults_should_skip_if_series_is_null()
|
||||||
|
{
|
||||||
|
var parseResults = Builder<EpisodeParseResult>.CreateListOfSize(5)
|
||||||
|
.All()
|
||||||
|
.With(e => e.SeasonNumber = 1)
|
||||||
|
.With(e => e.EpisodeNumbers = new List<int> { 1 })
|
||||||
|
.Build();
|
||||||
|
|
||||||
|
WithNullSeries();
|
||||||
|
|
||||||
|
//Act
|
||||||
|
var result = Mocker.Resolve<SearchProvider>().ProcessSearchResults(new ProgressNotification("Test"), parseResults, _matchingSeries, 1, 1);
|
||||||
|
|
||||||
|
//Assert
|
||||||
|
result.Should().HaveCount(0);
|
||||||
|
|
||||||
|
Mocker.GetMock<DownloadProvider>().Verify(c => c.DownloadReport(It.IsAny<EpisodeParseResult>()),
|
||||||
|
Times.Never());
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void processSearchResults_should_skip_if_series_is_mismatched()
|
||||||
|
{
|
||||||
|
var parseResults = Builder<EpisodeParseResult>.CreateListOfSize(5)
|
||||||
|
.All()
|
||||||
|
.With(e => e.SeasonNumber = 1)
|
||||||
|
.With(e => e.EpisodeNumbers = new List<int> { 1 })
|
||||||
|
.Build();
|
||||||
|
|
||||||
|
WithMisMatchedSeries();
|
||||||
|
|
||||||
|
//Act
|
||||||
|
var result = Mocker.Resolve<SearchProvider>().ProcessSearchResults(new ProgressNotification("Test"), parseResults, _matchingSeries, 1, 1);
|
||||||
|
|
||||||
|
//Assert
|
||||||
|
result.Should().HaveCount(0);
|
||||||
|
|
||||||
|
Mocker.GetMock<DownloadProvider>().Verify(c => c.DownloadReport(It.IsAny<EpisodeParseResult>()),
|
||||||
|
Times.Never());
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void processSearchResults_should_skip_if_season_doesnt_match()
|
||||||
|
{
|
||||||
|
var parseResults = Builder<EpisodeParseResult>.CreateListOfSize(5)
|
||||||
|
.All()
|
||||||
|
.With(e => e.SeasonNumber = 2)
|
||||||
|
.With(e => e.EpisodeNumbers = new List<int> { 1 })
|
||||||
|
.Build();
|
||||||
|
|
||||||
|
WithMatchingSeries();
|
||||||
|
|
||||||
|
//Act
|
||||||
|
var result = Mocker.Resolve<SearchProvider>().ProcessSearchResults(new ProgressNotification("Test"), parseResults, _matchingSeries, 1, 1);
|
||||||
|
|
||||||
|
//Assert
|
||||||
|
result.Should().HaveCount(0);
|
||||||
|
|
||||||
|
Mocker.GetMock<DownloadProvider>().Verify(c => c.DownloadReport(It.IsAny<EpisodeParseResult>()),
|
||||||
|
Times.Never());
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void processSearchResults_should_skip_if_episodeNumber_doesnt_match()
|
||||||
|
{
|
||||||
|
var parseResults = Builder<EpisodeParseResult>.CreateListOfSize(5)
|
||||||
|
.All()
|
||||||
|
.With(e => e.SeasonNumber = 1)
|
||||||
|
.With(e => e.EpisodeNumbers = new List<int> { 2 })
|
||||||
|
.Build();
|
||||||
|
|
||||||
|
WithMatchingSeries();
|
||||||
|
|
||||||
|
//Act
|
||||||
|
var result = Mocker.Resolve<SearchProvider>().ProcessSearchResults(new ProgressNotification("Test"), parseResults, _matchingSeries, 1, 1);
|
||||||
|
|
||||||
|
//Assert
|
||||||
|
result.Should().HaveCount(0);
|
||||||
|
|
||||||
|
Mocker.GetMock<DownloadProvider>().Verify(c => c.DownloadReport(It.IsAny<EpisodeParseResult>()),
|
||||||
|
Times.Never());
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void processSearchResults_should_skip_if_any_episodeNumber_was_already_added_to_download_queue()
|
||||||
|
{
|
||||||
|
var parseResults = Builder<EpisodeParseResult>.CreateListOfSize(2)
|
||||||
|
.All()
|
||||||
|
.With(e => e.SeasonNumber = 1)
|
||||||
|
.With(e => e.EpisodeNumbers = new List<int> { 5 })
|
||||||
|
.With(c => c.Quality = new Quality(QualityTypes.DVD, true))
|
||||||
|
.TheLast(1)
|
||||||
|
.With(e => e.EpisodeNumbers = new List<int> { 1,2,3,4,5 })
|
||||||
|
.Build();
|
||||||
|
|
||||||
|
WithMatchingSeries();
|
||||||
|
WithQualityNeeded();
|
||||||
|
WithSuccessfulDownload();
|
||||||
|
|
||||||
|
//Act
|
||||||
|
var result = Mocker.Resolve<SearchProvider>().ProcessSearchResults(new ProgressNotification("Test"), parseResults, _matchingSeries, 1);
|
||||||
|
|
||||||
|
//Assert
|
||||||
|
result.Should().HaveCount(1);
|
||||||
|
|
||||||
|
Mocker.GetMock<DownloadProvider>().Verify(c => c.DownloadReport(It.IsAny<EpisodeParseResult>()),
|
||||||
|
Times.Once());
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void processSearchResults_should_try_next_if_download_fails()
|
||||||
|
{
|
||||||
|
var parseResults = Builder<EpisodeParseResult>.CreateListOfSize(2)
|
||||||
|
.All()
|
||||||
|
.With(e => e.SeasonNumber = 1)
|
||||||
|
.With(e => e.EpisodeNumbers = new List<int> { 1 })
|
||||||
|
.With(c => c.Quality = new Quality(QualityTypes.DVD, true))
|
||||||
|
.TheLast(1)
|
||||||
|
.With(c => c.Quality = new Quality(QualityTypes.SDTV, true))
|
||||||
|
.Build();
|
||||||
|
|
||||||
|
WithMatchingSeries();
|
||||||
|
WithQualityNeeded();
|
||||||
|
|
||||||
|
Mocker.GetMock<DownloadProvider>()
|
||||||
|
.Setup(s => s.DownloadReport(It.Is<EpisodeParseResult>(d => d.Quality.QualityType == QualityTypes.DVD)))
|
||||||
|
.Returns(false);
|
||||||
|
|
||||||
|
Mocker.GetMock<DownloadProvider>()
|
||||||
|
.Setup(s => s.DownloadReport(It.Is<EpisodeParseResult>(d => d.Quality.QualityType == QualityTypes.SDTV)))
|
||||||
|
.Returns(true);
|
||||||
|
|
||||||
|
//Act
|
||||||
|
var result = Mocker.Resolve<SearchProvider>().ProcessSearchResults(new ProgressNotification("Test"), parseResults, _matchingSeries, 1);
|
||||||
|
|
||||||
|
//Assert
|
||||||
|
result.Should().HaveCount(1);
|
||||||
|
|
||||||
|
Mocker.GetMock<DownloadProvider>().Verify(c => c.DownloadReport(It.IsAny<EpisodeParseResult>()),
|
||||||
|
Times.Exactly(2));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -49,7 +49,9 @@ namespace NzbDrone.Core.Providers.Indexer
|
||||||
|
|
||||||
if (searchModel.SearchType == SearchType.SeasonSearch)
|
if (searchModel.SearchType == SearchType.SeasonSearch)
|
||||||
{
|
{
|
||||||
searchUrls.Add(String.Format("{0}&limit=100&q={1}&season{2}", url, searchModel.SeriesTitle, searchModel.SeasonNumber));
|
//Todo: Allow full season searching to process individual episodes
|
||||||
|
//searchUrls.Add(String.Format("{0}&limit=100&q={1}&season{2}", url, searchModel.SeriesTitle, searchModel.SeasonNumber));
|
||||||
|
searchUrls.Add(String.Format("{0}&limit=100&q={1}+Season", url, searchModel.SeriesTitle));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -52,29 +52,7 @@ namespace NzbDrone.Core.Providers
|
||||||
|
|
||||||
notification.CurrentMessage = String.Format("Searching for {0} Season {1}", series.Title, seasonNumber);
|
notification.CurrentMessage = String.Format("Searching for {0} Season {1}", series.Title, seasonNumber);
|
||||||
|
|
||||||
var indexers = _indexerProvider.GetEnabledIndexers();
|
var reports = PerformSearch(notification, series, seasonNumber);
|
||||||
var reports = new List<EpisodeParseResult>();
|
|
||||||
|
|
||||||
var title = _sceneMappingProvider.GetSceneName(series.SeriesId);
|
|
||||||
|
|
||||||
if (string.IsNullOrWhiteSpace(title))
|
|
||||||
{
|
|
||||||
title = series.Title;
|
|
||||||
}
|
|
||||||
|
|
||||||
foreach (var indexer in indexers)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
var indexerResults = indexer.FetchSeason(title, seasonNumber);
|
|
||||||
|
|
||||||
reports.AddRange(indexerResults);
|
|
||||||
}
|
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
Logger.ErrorException("An error has occurred while fetching items from " + indexer.Name, e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Logger.Debug("Finished searching all indexers. Total {0}", reports.Count);
|
Logger.Debug("Finished searching all indexers. Total {0}", reports.Count);
|
||||||
|
|
||||||
|
|
@ -92,51 +70,46 @@ namespace NzbDrone.Core.Providers
|
||||||
|
|
||||||
notification.CurrentMessage = "Processing search results";
|
notification.CurrentMessage = "Processing search results";
|
||||||
|
|
||||||
var reportsToProcess = reports.Where(p => p.FullSeason && p.SeasonNumber == seasonNumber).ToList();
|
reports.Where(p => p.FullSeason && p.SeasonNumber == seasonNumber).ToList().ForEach(
|
||||||
|
e => e.EpisodeNumbers = episodeNumbers.ToList()
|
||||||
|
);
|
||||||
|
|
||||||
reportsToProcess.ForEach(c =>
|
var downloadedEpisodes = ProcessSearchResults(notification, reports, series, seasonNumber);
|
||||||
{
|
|
||||||
c.Series = series;
|
|
||||||
c.EpisodeNumbers = episodeNumbers.ToList();
|
|
||||||
});
|
|
||||||
|
|
||||||
return ProcessSeasonSearchResults(notification, series, seasonNumber, reportsToProcess);
|
downloadedEpisodes.Sort();
|
||||||
|
episodeNumbers.ToList().Sort();
|
||||||
|
|
||||||
|
//Returns true if the list of downloaded episodes matches the list of episode numbers
|
||||||
|
//(either a full season release was grabbed or all individual episodes)
|
||||||
|
return (downloadedEpisodes.SequenceEqual(episodeNumbers));
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool ProcessSeasonSearchResults(ProgressNotification notification, Series series, int seasonNumber, IEnumerable<EpisodeParseResult> reports)
|
public virtual List<int> PartialSeasonSearch(ProgressNotification notification, int seriesId, int seasonNumber)
|
||||||
{
|
{
|
||||||
foreach (var episodeParseResult in reports.OrderByDescending(c => c.Quality))
|
//This method will search for episodes in a season in groups of 10 episodes S01E0, S01E1, S01E2, etc
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
Logger.Trace("Analysing report " + episodeParseResult);
|
|
||||||
if (_inventoryProvider.IsQualityNeeded(episodeParseResult))
|
|
||||||
{
|
|
||||||
Logger.Debug("Found '{0}'. Adding to download queue.", episodeParseResult);
|
|
||||||
try
|
|
||||||
{
|
|
||||||
_downloadProvider.DownloadReport(episodeParseResult);
|
|
||||||
notification.CurrentMessage = String.Format("{0} Season {1} {2} Added to download queue", series.Title, seasonNumber, episodeParseResult.Quality);
|
|
||||||
}
|
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
Logger.ErrorException("Unable to add report to download queue." + episodeParseResult, e);
|
|
||||||
notification.CurrentMessage = String.Format("Unable to add report to download queue. {0}", episodeParseResult);
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
var series = _seriesProvider.GetSeries(seriesId);
|
||||||
}
|
|
||||||
}
|
if (series == null)
|
||||||
catch (Exception e)
|
{
|
||||||
{
|
Logger.Error("Unable to find an series {0} in database", seriesId);
|
||||||
Logger.ErrorException("An error has occurred while processing parse result items from " + episodeParseResult, e);
|
return new List<int>();
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Logger.Warn("Unable to find {0} Season {1} in any of indexers.", series.Title, seasonNumber);
|
notification.CurrentMessage = String.Format("Searching for {0} Season {1}", series.Title, seasonNumber);
|
||||||
notification.CurrentMessage = String.Format("Unable to find {0} Season {1} in any of indexers.", series.Title, seasonNumber);
|
|
||||||
|
|
||||||
return false;
|
var episodes = _episodeProvider.GetEpisodesBySeason(seriesId, seasonNumber);
|
||||||
|
|
||||||
|
var reports = PerformSearch(notification, series, seasonNumber, episodes);
|
||||||
|
|
||||||
|
Logger.Debug("Finished searching all indexers. Total {0}", reports.Count);
|
||||||
|
|
||||||
|
if (reports.Count == 0)
|
||||||
|
return new List<int>();
|
||||||
|
|
||||||
|
notification.CurrentMessage = "Processing search results";
|
||||||
|
|
||||||
|
return ProcessSearchResults(notification, reports, series, seasonNumber);
|
||||||
}
|
}
|
||||||
|
|
||||||
public virtual bool EpisodeSearch(ProgressNotification notification, int episodeId)
|
public virtual bool EpisodeSearch(ProgressNotification notification, int episodeId)
|
||||||
|
|
@ -190,58 +163,12 @@ namespace NzbDrone.Core.Providers
|
||||||
c.Series = series;
|
c.Series = series;
|
||||||
});
|
});
|
||||||
|
|
||||||
return ProcessEpisodeSearchResults(notification, episode, reports);
|
return (ProcessSearchResults(notification, reports, series, episode.SeasonNumber, episode.EpisodeNumber).Count == 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool ProcessEpisodeSearchResults(ProgressNotification notification, Episode episode, IEnumerable<EpisodeParseResult> reports)
|
public List<EpisodeParseResult> PerformSearch(ProgressNotification notification, Series series, int seasonNumber, IList<Episode> episodes = null)
|
||||||
{
|
{
|
||||||
foreach (var episodeParseResult in reports.OrderByDescending(c => c.Quality))
|
//If single episode, do a single episode search, if full season then do a full season search, otherwise, do a partial search
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
Logger.Trace("Analysing report " + episodeParseResult);
|
|
||||||
if (_inventoryProvider.IsQualityNeeded(episodeParseResult))
|
|
||||||
{
|
|
||||||
Logger.Debug("Found '{0}'. Adding to download queue.", episodeParseResult);
|
|
||||||
try
|
|
||||||
{
|
|
||||||
_downloadProvider.DownloadReport(episodeParseResult);
|
|
||||||
notification.CurrentMessage = String.Format("{0} {1} Added to download queue", episode, episodeParseResult.Quality);
|
|
||||||
}
|
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
Logger.ErrorException("Unable to add report to download queue." + episodeParseResult, e);
|
|
||||||
notification.CurrentMessage = String.Format("Unable to add report to download queue. {0}", episodeParseResult);
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
Logger.ErrorException("An error has occurred while processing parse result items from " + episodeParseResult, e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Logger.Warn("Unable to find {0} in any of indexers.", episode);
|
|
||||||
notification.CurrentMessage = String.Format("Unable to find {0} in any of indexers.", episode);
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
public virtual List<int> PartialSeasonSearch(ProgressNotification notification, int seriesId, int seasonNumber)
|
|
||||||
{
|
|
||||||
//This method will search for episodes in a season in groups of 10 episodes S01E0, S01E1, S01E2, etc
|
|
||||||
|
|
||||||
var series = _seriesProvider.GetSeries(seriesId);
|
|
||||||
|
|
||||||
if (series == null)
|
|
||||||
{
|
|
||||||
Logger.Error("Unable to find an series {0} in database", seriesId);
|
|
||||||
return new List<int>();
|
|
||||||
}
|
|
||||||
|
|
||||||
notification.CurrentMessage = String.Format("Searching for {0} Season {1}", series.Title, seasonNumber);
|
|
||||||
|
|
||||||
var indexers = _indexerProvider.GetEnabledIndexers();
|
var indexers = _indexerProvider.GetEnabledIndexers();
|
||||||
var reports = new List<EpisodeParseResult>();
|
var reports = new List<EpisodeParseResult>();
|
||||||
|
|
@ -253,47 +180,38 @@ namespace NzbDrone.Core.Providers
|
||||||
title = series.Title;
|
title = series.Title;
|
||||||
}
|
}
|
||||||
|
|
||||||
var episodes = _episodeProvider.GetEpisodesBySeason(seriesId, seasonNumber);
|
foreach(var indexer in indexers)
|
||||||
var episodeCount = episodes.Count;
|
|
||||||
var episodePrefix = 0;
|
|
||||||
|
|
||||||
while(episodeCount >= 0)
|
|
||||||
{
|
{
|
||||||
//Do the actual search for each indexer
|
try
|
||||||
foreach (var indexer in indexers)
|
|
||||||
{
|
{
|
||||||
try
|
if (episodes == null)
|
||||||
{
|
reports.AddRange(indexer.FetchSeason(title, seasonNumber));
|
||||||
var indexerResults = indexer.FetchPartialSeason(title, seasonNumber, episodePrefix);
|
|
||||||
|
|
||||||
reports.AddRange(indexerResults);
|
else if(episodes.Count == 1)
|
||||||
}
|
reports.AddRange(indexer.FetchEpisode(title, seasonNumber, episodes.First().EpisodeNumber));
|
||||||
catch (Exception e)
|
|
||||||
|
//Treat as Partial Season
|
||||||
|
else
|
||||||
{
|
{
|
||||||
Logger.ErrorException("An error has occurred while fetching items from " + indexer.Name, e);
|
var prefixes = GetEpisodeNumberPrefixes(episodes.Select(s => s.EpisodeNumber));
|
||||||
|
|
||||||
|
foreach(var episodePrefix in prefixes)
|
||||||
|
{
|
||||||
|
reports.AddRange(indexer.FetchPartialSeason(title, seasonNumber, episodePrefix));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
episodePrefix++;
|
catch (Exception e)
|
||||||
episodeCount -= 10;
|
{
|
||||||
|
Logger.ErrorException("An error has occurred while fetching items from " + indexer.Name, e);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Logger.Debug("Finished searching all indexers. Total {0}", reports.Count);
|
return reports;
|
||||||
|
|
||||||
if (reports.Count == 0)
|
|
||||||
return new List<int>();
|
|
||||||
|
|
||||||
notification.CurrentMessage = "Processing search results";
|
|
||||||
|
|
||||||
reports.ForEach(c =>
|
|
||||||
{
|
|
||||||
c.Series = series;
|
|
||||||
});
|
|
||||||
|
|
||||||
return ProcessPartialSeasonSearchResults(notification, reports);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<int> ProcessPartialSeasonSearchResults(ProgressNotification notification, IEnumerable<EpisodeParseResult> reports)
|
public List<int> ProcessSearchResults(ProgressNotification notification, IEnumerable<EpisodeParseResult> reports, Series series, int seasonNumber, int? episodeNumber = null)
|
||||||
{
|
{
|
||||||
var successes = new List<int>();
|
var successes = new List<int>();
|
||||||
|
|
||||||
|
|
@ -302,17 +220,41 @@ namespace NzbDrone.Core.Providers
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
Logger.Trace("Analysing report " + episodeParseResult);
|
Logger.Trace("Analysing report " + episodeParseResult);
|
||||||
|
|
||||||
|
//Get the matching series
|
||||||
|
episodeParseResult.Series = _seriesProvider.FindSeries(episodeParseResult.CleanTitle);
|
||||||
|
|
||||||
|
//If series is null or doesn't match the series we're looking for return
|
||||||
|
if (episodeParseResult.Series == null || episodeParseResult.Series.SeriesId != series.SeriesId)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
//If SeasonNumber doesn't match or episode is not in the in the list in the parse result, skip the report.
|
||||||
|
if (episodeParseResult.SeasonNumber != seasonNumber)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
//If the EpisodeNumber was passed in and it is not contained in the parseResult, skip the report.
|
||||||
|
if (episodeNumber.HasValue && !episodeParseResult.EpisodeNumbers.Contains(episodeNumber.Value))
|
||||||
|
continue;
|
||||||
|
|
||||||
|
//Make sure we haven't already downloaded a report with this episodenumber, if we have, skip the report.
|
||||||
|
if (successes.Intersect(episodeParseResult.EpisodeNumbers).Count() > 0)
|
||||||
|
continue;
|
||||||
|
|
||||||
if (_inventoryProvider.IsQualityNeeded(episodeParseResult))
|
if (_inventoryProvider.IsQualityNeeded(episodeParseResult))
|
||||||
{
|
{
|
||||||
Logger.Debug("Found '{0}'. Adding to download queue.", episodeParseResult);
|
Logger.Debug("Found '{0}'. Adding to download queue.", episodeParseResult);
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
_downloadProvider.DownloadReport(episodeParseResult);
|
if (_downloadProvider.DownloadReport(episodeParseResult))
|
||||||
notification.CurrentMessage = String.Format("{0} - S{1:00}E{2:00} {3}Added to download queue",
|
{
|
||||||
episodeParseResult.Series.Title, episodeParseResult.SeasonNumber, episodeParseResult.EpisodeNumbers[0], episodeParseResult.Quality);
|
notification.CurrentMessage =
|
||||||
|
String.Format("{0} - S{1:00}E{2:00} {3}Added to download queue",
|
||||||
|
episodeParseResult.Series.Title, episodeParseResult.SeasonNumber,
|
||||||
|
episodeParseResult.EpisodeNumbers[0], episodeParseResult.Quality);
|
||||||
|
|
||||||
//Add the list of episode numbers from this release
|
//Add the list of episode numbers from this release
|
||||||
successes.AddRange(episodeParseResult.EpisodeNumbers);
|
successes.AddRange(episodeParseResult.EpisodeNumbers);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
|
|
@ -329,5 +271,17 @@ namespace NzbDrone.Core.Providers
|
||||||
|
|
||||||
return successes;
|
return successes;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private List<int> GetEpisodeNumberPrefixes(IEnumerable<int> episodeNumbers)
|
||||||
|
{
|
||||||
|
var results = new List<int>();
|
||||||
|
|
||||||
|
foreach (var i in episodeNumbers)
|
||||||
|
{
|
||||||
|
results.Add(i / 10);
|
||||||
|
}
|
||||||
|
|
||||||
|
return results.Distinct().ToList();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue