Archive-Team
/
sonarr-repo-only
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed: Regression preventing new downloads from bypassing the Download Client Back-off logic. 

fixes #2277
This commit is contained in:
Taloth Saldono 2017-11-08 21:29:57 +01:00
parent cf7b8455d4
commit 0688340722
3 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/NzbDrone.Core.Test/Download/DownloadServiceFixture.cs
View File

@ -205,18 +205,26 @@ namespace NzbDrone.Core.Test.Download
} }
[Test] [Test]
public void should_not_attempt_download_if_client_is_disabled() public void should_attempt_download_even_if_client_is_disabled()
{ {
WithUsenetClient(); var mockUsenet = WithUsenetClient();
Mocker.GetMock<IDownloadClientStatusService>() Mocker.GetMock<IDownloadClientStatusService>()
.Setup(v => v.IsDisabled(It.IsAny<int>())) .Setup(v => v.GetBlockedProviders())
.Returns(true); .Returns(new List<DownloadClientStatus>
{
new DownloadClientStatus
{
ProviderId = _downloadClients.First().Definition.Id,
DisabledTill = DateTime.UtcNow.AddHours(3)
}
});
Assert.Throws<DownloadClientUnavailableException>(() => Subject.DownloadReport(_parseResult)); Subject.DownloadReport(_parseResult);
Mocker.GetMock<IDownloadClient>().Verify(c => c.Download(It.IsAny<RemoteEpisode>()), Times.Never()); Mocker.GetMock<IDownloadClientStatusService>().Verify(c => c.GetBlockedProviders(), Times.Never());
VerifyEventNotPublished<EpisodeGrabbedEvent>(); mockUsenet.Verify(c => c.Download(It.IsAny<RemoteEpisode>()), Times.Once());
VerifyEventPublished<EpisodeGrabbedEvent>();
} }
[Test] [Test]

5
src/NzbDrone.Core/Download/DownloadService.cs
View File

@ -56,11 +56,6 @@ namespace NzbDrone.Core.Download
throw new DownloadClientUnavailableException($"{remoteEpisode.Release.DownloadProtocol} Download client isn't configured yet"); throw new DownloadClientUnavailableException($"{remoteEpisode.Release.DownloadProtocol} Download client isn't configured yet");
} }
if (_downloadClientStatusService.IsDisabled(downloadClient.Definition.Id))
{
throw new DownloadClientUnavailableException($"{downloadClient.Name} is disabled due to recent failues");
}
// Limit grabs to 2 per second. // Limit grabs to 2 per second.
if (remoteEpisode.Release.DownloadUrl.IsNotNullOrWhiteSpace() && !remoteEpisode.Release.DownloadUrl.StartsWith("magnet:")) if (remoteEpisode.Release.DownloadUrl.IsNotNullOrWhiteSpace() && !remoteEpisode.Release.DownloadUrl.StartsWith("magnet:"))
{ {

6
src/NzbDrone.Core/ThingiProvider/Status/ProviderStatusServiceBase.cs
View File

@ -10,7 +10,6 @@ namespace NzbDrone.Core.ThingiProvider.Status
public interface IProviderStatusServiceBase<TModel> public interface IProviderStatusServiceBase<TModel>
where TModel : ProviderStatusBase, new() where TModel : ProviderStatusBase, new()
{ {
bool IsDisabled(int providerId);
List<TModel> GetBlockedProviders(); List<TModel> GetBlockedProviders();
void RecordSuccess(int providerId); void RecordSuccess(int providerId);
void RecordFailure(int providerId, TimeSpan minimumBackOff = default(TimeSpan)); void RecordFailure(int providerId, TimeSpan minimumBackOff = default(TimeSpan));
@ -37,11 +36,6 @@ namespace NzbDrone.Core.ThingiProvider.Status
_logger = logger; _logger = logger;
} }
public bool IsDisabled(int providerId)
{
return GetProviderStatus(providerId).IsDisabled();
}
public virtual List<TModel> GetBlockedProviders() public virtual List<TModel> GetBlockedProviders()
{ {
return _providerStatusRepository.All().Where(v => v.IsDisabled()).ToList(); return _providerStatusRepository.All().Where(v => v.IsDisabled()).ToList();