mirror of
https://github.com/Radarr/Radarr.git
synced 2024-09-11 12:02:35 +02:00
Fixed: Pending releases from blocked indexers should not be grabbed.
ref #1961
This commit is contained in:
parent
1fbe82ae47
commit
6a6d415625
@ -0,0 +1,54 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using FluentAssertions;
|
||||||
|
using NUnit.Framework;
|
||||||
|
using NzbDrone.Core.DecisionEngine;
|
||||||
|
using NzbDrone.Core.DecisionEngine.Specifications;
|
||||||
|
using NzbDrone.Core.Indexers;
|
||||||
|
using NzbDrone.Core.Parser.Model;
|
||||||
|
using NzbDrone.Core.Test.Framework;
|
||||||
|
|
||||||
|
namespace NzbDrone.Core.Test.DecisionEngineTests
|
||||||
|
{
|
||||||
|
[TestFixture]
|
||||||
|
|
||||||
|
public class BlockedIndexerSpecificationFixture : CoreTest<BlockedIndexerSpecification>
|
||||||
|
{
|
||||||
|
private RemoteEpisode _remoteEpisode;
|
||||||
|
|
||||||
|
[SetUp]
|
||||||
|
public void Setup()
|
||||||
|
{
|
||||||
|
_remoteEpisode = new RemoteEpisode
|
||||||
|
{
|
||||||
|
Release = new ReleaseInfo { IndexerId = 1 }
|
||||||
|
};
|
||||||
|
|
||||||
|
Mocker.GetMock<IIndexerStatusService>()
|
||||||
|
.Setup(v => v.GetBlockedProviders())
|
||||||
|
.Returns(new List<IndexerStatus>());
|
||||||
|
}
|
||||||
|
|
||||||
|
private void WithBlockedIndexer()
|
||||||
|
{
|
||||||
|
Mocker.GetMock<IIndexerStatusService>()
|
||||||
|
.Setup(v => v.GetBlockedProviders())
|
||||||
|
.Returns(new List<IndexerStatus> { new IndexerStatus { ProviderId = 1, DisabledTill = DateTime.UtcNow } });
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void should_return_true_if_no_blocked_indexer()
|
||||||
|
{
|
||||||
|
Subject.IsSatisfiedBy(_remoteEpisode, null).Accepted.Should().BeTrue();
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void should_return_false_if_blocked_indexer()
|
||||||
|
{
|
||||||
|
WithBlockedIndexer();
|
||||||
|
|
||||||
|
Subject.IsSatisfiedBy(_remoteEpisode, null).Accepted.Should().BeFalse();
|
||||||
|
Subject.Type.Should().Be(RejectionType.Temporary);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -165,6 +165,7 @@
|
|||||||
<Compile Include="DecisionEngineTests\Search\SeriesSpecificationFixture.cs" />
|
<Compile Include="DecisionEngineTests\Search\SeriesSpecificationFixture.cs" />
|
||||||
<Compile Include="DecisionEngineTests\SameEpisodesSpecificationFixture.cs" />
|
<Compile Include="DecisionEngineTests\SameEpisodesSpecificationFixture.cs" />
|
||||||
<Compile Include="DecisionEngineTests\RawDiskSpecificationFixture.cs" />
|
<Compile Include="DecisionEngineTests\RawDiskSpecificationFixture.cs" />
|
||||||
|
<Compile Include="DecisionEngineTests\BlockedIndexerSpecificationFixture.cs" />
|
||||||
<Compile Include="DecisionEngineTests\UpgradeDiskSpecificationFixture.cs" />
|
<Compile Include="DecisionEngineTests\UpgradeDiskSpecificationFixture.cs" />
|
||||||
<Compile Include="DiskSpace\DiskSpaceServiceFixture.cs" />
|
<Compile Include="DiskSpace\DiskSpaceServiceFixture.cs" />
|
||||||
<Compile Include="Download\CompletedDownloadServiceFixture.cs" />
|
<Compile Include="Download\CompletedDownloadServiceFixture.cs" />
|
||||||
|
@ -0,0 +1,46 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using NLog;
|
||||||
|
using NzbDrone.Common.Cache;
|
||||||
|
using NzbDrone.Core.Indexers;
|
||||||
|
using NzbDrone.Core.IndexerSearch.Definitions;
|
||||||
|
using NzbDrone.Core.Parser.Model;
|
||||||
|
|
||||||
|
namespace NzbDrone.Core.DecisionEngine.Specifications
|
||||||
|
{
|
||||||
|
public class BlockedIndexerSpecification : IDecisionEngineSpecification
|
||||||
|
{
|
||||||
|
private readonly IIndexerStatusService _indexerStatusService;
|
||||||
|
private readonly Logger _logger;
|
||||||
|
|
||||||
|
private readonly ICachedDictionary<IndexerStatus> _blockedIndexerCache;
|
||||||
|
|
||||||
|
public BlockedIndexerSpecification(IIndexerStatusService indexerStatusService, ICacheManager cacheManager, Logger logger)
|
||||||
|
{
|
||||||
|
_indexerStatusService = indexerStatusService;
|
||||||
|
_logger = logger;
|
||||||
|
|
||||||
|
_blockedIndexerCache = cacheManager.GetCacheDictionary(GetType(), "blocked", FetchBlockedIndexer, TimeSpan.FromSeconds(15));
|
||||||
|
}
|
||||||
|
|
||||||
|
public SpecificationPriority Priority => SpecificationPriority.Database;
|
||||||
|
public RejectionType Type => RejectionType.Temporary;
|
||||||
|
|
||||||
|
public virtual Decision IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase searchCriteria)
|
||||||
|
{
|
||||||
|
var status = _blockedIndexerCache.Find(subject.Release.IndexerId.ToString());
|
||||||
|
if (status != null)
|
||||||
|
{
|
||||||
|
return Decision.Reject($"Indexer {subject.Release.Indexer} is blocked till {status.DisabledTill} due to failures, cannot grab release.");
|
||||||
|
}
|
||||||
|
|
||||||
|
return Decision.Accept();
|
||||||
|
}
|
||||||
|
|
||||||
|
private IDictionary<string, IndexerStatus> FetchBlockedIndexer()
|
||||||
|
{
|
||||||
|
return _indexerStatusService.GetBlockedProviders().ToDictionary(v => v.ProviderId.ToString());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -350,6 +350,7 @@
|
|||||||
<Compile Include="DecisionEngine\Specifications\TorrentSeedingSpecification.cs" />
|
<Compile Include="DecisionEngine\Specifications\TorrentSeedingSpecification.cs" />
|
||||||
<Compile Include="DecisionEngine\Specifications\SameEpisodesGrabSpecification.cs" />
|
<Compile Include="DecisionEngine\Specifications\SameEpisodesGrabSpecification.cs" />
|
||||||
<Compile Include="DecisionEngine\Specifications\RawDiskSpecification.cs" />
|
<Compile Include="DecisionEngine\Specifications\RawDiskSpecification.cs" />
|
||||||
|
<Compile Include="DecisionEngine\Specifications\BlockedIndexerSpecification.cs" />
|
||||||
<Compile Include="DecisionEngine\Specifications\UpgradeDiskSpecification.cs" />
|
<Compile Include="DecisionEngine\Specifications\UpgradeDiskSpecification.cs" />
|
||||||
<Compile Include="DiskSpace\DiskSpace.cs" />
|
<Compile Include="DiskSpace\DiskSpace.cs" />
|
||||||
<Compile Include="DiskSpace\DiskSpaceService.cs" />
|
<Compile Include="DiskSpace\DiskSpaceService.cs" />
|
||||||
|
Loading…
Reference in New Issue
Block a user