From 25c9de857b376fb30b02184b82a128b59bff4a50 Mon Sep 17 00:00:00 2001 From: bakerboy448 <55419169+bakerboy448@users.noreply.github.com> Date: Thu, 22 Sep 2022 11:49:19 -0500 Subject: [PATCH] Fixed: Repack Preference Ignored (cherry picked from commit 04447d9d4db8cc3d54baf0a721f4430cf77908c4) --- .../RepackSpecificationFixture.cs | 85 +++++++++++++++++++ .../Specifications/RepackSpecification.cs | 20 ++++- 2 files changed, 104 insertions(+), 1 deletion(-) diff --git a/src/NzbDrone.Core.Test/DecisionEngineTests/RepackSpecificationFixture.cs b/src/NzbDrone.Core.Test/DecisionEngineTests/RepackSpecificationFixture.cs index 17d49a457..dc3f6713a 100644 --- a/src/NzbDrone.Core.Test/DecisionEngineTests/RepackSpecificationFixture.cs +++ b/src/NzbDrone.Core.Test/DecisionEngineTests/RepackSpecificationFixture.cs @@ -1,9 +1,11 @@ +using System; using System.Collections.Generic; using System.Linq; using FizzWare.NBuilder; using FluentAssertions; using Moq; using NUnit.Framework; +using NzbDrone.Core.Configuration; using NzbDrone.Core.DecisionEngine.Specifications; using NzbDrone.Core.MediaFiles; using NzbDrone.Core.Music; @@ -244,5 +246,88 @@ namespace NzbDrone.Core.Test.DecisionEngineTests .Should() .BeFalse(); } + + [Test] + public void should_return_true_when_repacks_are_not_preferred() + { + Mocker.GetMock() + .Setup(s => s.DownloadPropersAndRepacks) + .Returns(ProperDownloadTypes.DoNotPrefer); + + _trackFiles.Select(c => + { + c.ReleaseGroup = ""; + return c; + }).ToList(); + + _trackFiles.Select(c => + { + c.Quality = new QualityModel(Quality.FLAC); + return c; + }).ToList(); + + var remoteAlbum = Builder.CreateNew() + .With(e => e.ParsedAlbumInfo = _parsedAlbumInfo) + .With(e => e.Albums = _albums) + .Build(); + + Subject.IsSatisfiedBy(remoteAlbum, null).Accepted.Should().BeTrue(); + } + + [Test] + public void should_return_true_when_repack_but_auto_download_repacks_is_true() + { + Mocker.GetMock() + .Setup(s => s.DownloadPropersAndRepacks) + .Returns(ProperDownloadTypes.PreferAndUpgrade); + + _parsedAlbumInfo.Quality.Revision.IsRepack = true; + + _trackFiles.Select(c => + { + c.ReleaseGroup = "Lidarr"; + return c; + }).ToList(); + _trackFiles.Select(c => + { + c.Quality = new QualityModel(Quality.FLAC); + return c; + }).ToList(); + + var remoteAlbum = Builder.CreateNew() + .With(e => e.ParsedAlbumInfo = _parsedAlbumInfo) + .With(e => e.Albums = _albums) + .Build(); + + Subject.IsSatisfiedBy(remoteAlbum, null).Accepted.Should().BeTrue(); + } + + [Test] + public void should_return_false_when_repack_but_auto_download_repacks_is_false() + { + Mocker.GetMock() + .Setup(s => s.DownloadPropersAndRepacks) + .Returns(ProperDownloadTypes.DoNotUpgrade); + + _parsedAlbumInfo.Quality.Revision.IsRepack = true; + + _trackFiles.Select(c => + { + c.ReleaseGroup = "Lidarr"; + return c; + }).ToList(); + _trackFiles.Select(c => + { + c.Quality = new QualityModel(Quality.FLAC); + return c; + }).ToList(); + + var remoteAlbum = Builder.CreateNew() + .With(e => e.ParsedAlbumInfo = _parsedAlbumInfo) + .With(e => e.Albums = _albums) + .Build(); + + Subject.IsSatisfiedBy(remoteAlbum, null).Accepted.Should().BeFalse(); + } } } diff --git a/src/NzbDrone.Core/DecisionEngine/Specifications/RepackSpecification.cs b/src/NzbDrone.Core/DecisionEngine/Specifications/RepackSpecification.cs index 86198d776..f44db3f9f 100644 --- a/src/NzbDrone.Core/DecisionEngine/Specifications/RepackSpecification.cs +++ b/src/NzbDrone.Core/DecisionEngine/Specifications/RepackSpecification.cs @@ -1,9 +1,11 @@ using System; using NLog; using NzbDrone.Common.Extensions; +using NzbDrone.Core.Configuration; using NzbDrone.Core.IndexerSearch.Definitions; using NzbDrone.Core.MediaFiles; using NzbDrone.Core.Parser.Model; +using NzbDrone.Core.Qualities; namespace NzbDrone.Core.DecisionEngine.Specifications { @@ -11,12 +13,14 @@ namespace NzbDrone.Core.DecisionEngine.Specifications { private readonly IMediaFileService _mediaFileService; private readonly UpgradableSpecification _upgradableSpecification; + private readonly IConfigService _configService; private readonly Logger _logger; - public RepackSpecification(IMediaFileService mediaFileService, UpgradableSpecification upgradableSpecification, Logger logger) + public RepackSpecification(IMediaFileService mediaFileService, UpgradableSpecification upgradableSpecification, IConfigService configService, Logger logger) { _mediaFileService = mediaFileService; _upgradableSpecification = upgradableSpecification; + _configService = configService; _logger = logger; } @@ -30,6 +34,14 @@ namespace NzbDrone.Core.DecisionEngine.Specifications return Decision.Accept(); } + var downloadPropersAndRepacks = _configService.DownloadPropersAndRepacks; + + if (downloadPropersAndRepacks == ProperDownloadTypes.DoNotPrefer) + { + _logger.Debug("Repacks are not preferred, skipping check"); + return Decision.Accept(); + } + foreach (var album in subject.Albums) { var releaseGroup = subject.ParsedAlbumInfo.ReleaseGroup; @@ -39,6 +51,12 @@ namespace NzbDrone.Core.DecisionEngine.Specifications { if (_upgradableSpecification.IsRevisionUpgrade(file.Quality, subject.ParsedAlbumInfo.Quality)) { + if (downloadPropersAndRepacks == ProperDownloadTypes.DoNotUpgrade) + { + _logger.Debug("Auto downloading of repacks is disabled"); + return Decision.Reject("Repack downloading is disabled"); + } + var fileReleaseGroup = file.ReleaseGroup; if (fileReleaseGroup.IsNullOrWhiteSpace())