github/lidarr
1
0
Fork 0
mirror of https://github.com/lidarr/lidarr.git synced 2025-08-19 04:59:35 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixed: Delay profile being ignored for non-revision upgrades

Browse source
This commit is contained in:
Qstick 2020-09-06 22:16:30 -04:00
commit 5bca13b21f
2 changed files with 8 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/NzbDrone.Core.Test/DecisionEngineTests/RssSync/DelaySpecificationFixture.cs
View file

@ -48,7 +48,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests.RssSync
_profile.Items = new List<QualityProfileQualityItem>(); _profile.Items = new List<QualityProfileQualityItem>();
_profile.Items.Add(new QualityProfileQualityItem { Allowed = true, Quality = Quality.MP3_256 }); _profile.Items.Add(new QualityProfileQualityItem { Allowed = true, Quality = Quality.MP3_256 });
_profile.Items.Add(new QualityProfileQualityItem { Allowed = true, Quality = Quality.MP3_320 }); _profile.Items.Add(new QualityProfileQualityItem { Allowed = true, Quality = Quality.MP3_320 });
_profile.Items.Add(new QualityProfileQualityItem { Allowed = true, Quality = Quality.MP3_320 }); _profile.Items.Add(new QualityProfileQualityItem { Allowed = true, Quality = Quality.FLAC });
_profile.Cutoff = Quality.MP3_320.Id; _profile.Cutoff = Quality.MP3_320.Id;
@ -185,10 +185,10 @@ namespace NzbDrone.Core.Test.DecisionEngineTests.RssSync
[Test] [Test]
public void should_be_false_when_release_is_proper_for_existing_album_of_different_quality() public void should_be_false_when_release_is_proper_for_existing_album_of_different_quality()
{ {
_remoteAlbum.ParsedAlbumInfo.Quality = new QualityModel(Quality.MP3_256, new Revision(version: 2)); _remoteAlbum.ParsedAlbumInfo.Quality = new QualityModel(Quality.MP3_320, new Revision(version: 2));
_remoteAlbum.Release.PublishDate = DateTime.UtcNow; _remoteAlbum.Release.PublishDate = DateTime.UtcNow;
GivenExistingFile(new QualityModel(Quality.MP3_192)); GivenExistingFile(new QualityModel(Quality.MP3_256));
_delayProfile.UsenetDelay = 720; _delayProfile.UsenetDelay = 720;

13
src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/DelaySpecification.cs
View file

@ -64,16 +64,13 @@ namespace NzbDrone.Core.DecisionEngine.Specifications.RssSync
{ {
var trackFiles = _mediaFileService.GetFilesByAlbum(album.Id); var trackFiles = _mediaFileService.GetFilesByAlbum(album.Id);
if (trackFiles.Any()) foreach (var file in trackFiles)
{ {
var currentQualities = trackFiles.Select(c => c.Quality).Distinct().ToList(); var currentQuality = file.Quality;
var newQuality = subject.ParsedAlbumInfo.Quality;
var qualityCompare = qualityComparer.Compare(newQuality?.Quality, currentQuality.Quality);
var upgradable = _upgradableSpecification.IsUpgradable(qualityProfile, if (qualityCompare == 0 && newQuality?.Revision.CompareTo(currentQuality.Revision) > 0)
currentQualities,
_preferredWordServiceCalculator.Calculate(subject.Artist, trackFiles[0].GetSceneOrFileName()),
subject.ParsedAlbumInfo.Quality,
subject.PreferredWordScore);
if (upgradable)
{ {
_logger.Debug("New quality is a better revision for existing quality, skipping delay"); _logger.Debug("New quality is a better revision for existing quality, skipping delay");
return Decision.Accept(); return Decision.Accept();