From 0800029713cfe8bf03790e298a3234a35dceaba9 Mon Sep 17 00:00:00 2001 From: Qstick Date: Sat, 29 Aug 2020 01:12:43 -0400 Subject: [PATCH] Fixed: Quality Profile group order no longer used when ordering results --- .../Qualities/QualityDefinitionServiceFixture.cs | 1 - src/NzbDrone.Core/Profiles/Profile.cs | 8 ++++---- src/NzbDrone.Core/Qualities/QualityModelComparer.cs | 4 ++-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/NzbDrone.Core.Test/Qualities/QualityDefinitionServiceFixture.cs b/src/NzbDrone.Core.Test/Qualities/QualityDefinitionServiceFixture.cs index c2417fa53..5607eab1c 100644 --- a/src/NzbDrone.Core.Test/Qualities/QualityDefinitionServiceFixture.cs +++ b/src/NzbDrone.Core.Test/Qualities/QualityDefinitionServiceFixture.cs @@ -52,7 +52,6 @@ namespace NzbDrone.Core.Test.Qualities } [Test] - [Ignore("Doesn't work")] public void init_should_remove_old_definitions() { Mocker.GetMock() diff --git a/src/NzbDrone.Core/Profiles/Profile.cs b/src/NzbDrone.Core/Profiles/Profile.cs index 16bd35e89..0952af29f 100644 --- a/src/NzbDrone.Core/Profiles/Profile.cs +++ b/src/NzbDrone.Core/Profiles/Profile.cs @@ -38,12 +38,12 @@ namespace NzbDrone.Core.Profiles return lastAllowed.Items.Last().Quality; } - public QualityIndex GetIndex(Quality quality) + public QualityIndex GetIndex(Quality quality, bool respectGroupOrder = false) { - return GetIndex(quality.Id); + return GetIndex(quality.Id, respectGroupOrder); } - public QualityIndex GetIndex(int id) + public QualityIndex GetIndex(int id, bool respectGroupOrder = false) { for (var i = 0; i < Items.Count; i++) { @@ -68,7 +68,7 @@ namespace NzbDrone.Core.Profiles if (groupItem.Quality.Id == id) { - return new QualityIndex(i, g); + return respectGroupOrder ? new QualityIndex(i, g) : new QualityIndex(i); } } } diff --git a/src/NzbDrone.Core/Qualities/QualityModelComparer.cs b/src/NzbDrone.Core/Qualities/QualityModelComparer.cs index ac407b2d8..c4bf4b65a 100644 --- a/src/NzbDrone.Core/Qualities/QualityModelComparer.cs +++ b/src/NzbDrone.Core/Qualities/QualityModelComparer.cs @@ -31,8 +31,8 @@ namespace NzbDrone.Core.Qualities public int Compare(Quality left, Quality right, bool respectGroupOrder) { - var leftIndex = _profile.GetIndex(left); - var rightIndex = _profile.GetIndex(right); + var leftIndex = _profile.GetIndex(left, respectGroupOrder); + var rightIndex = _profile.GetIndex(right, respectGroupOrder); return leftIndex.CompareTo(rightIndex, respectGroupOrder); }