From cde31e23c87baaebba0b3a842eb7015b54f124e6 Mon Sep 17 00:00:00 2001 From: Jon Crall Date: Tue, 30 Dec 2025 16:08:38 -0500 Subject: [PATCH] Simplify select-all reset helper --- .../Pages/MediaCardSelectionHelperTests.cs | 6 ++---- ErsatzTV/Pages/MultiSelectBase.cs | 8 ++------ 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/ErsatzTV.Core.Tests/Pages/MediaCardSelectionHelperTests.cs b/ErsatzTV.Core.Tests/Pages/MediaCardSelectionHelperTests.cs index 9927bd350..ab208fb87 100644 --- a/ErsatzTV.Core.Tests/Pages/MediaCardSelectionHelperTests.cs +++ b/ErsatzTV.Core.Tests/Pages/MediaCardSelectionHelperTests.cs @@ -18,10 +18,9 @@ public class MediaCardSelectionHelperTests var first = new MediaCardViewModel(2, "First", "Sub", "First", "", Core.Domain.MediaItemState.Normal, false); var second = new MediaCardViewModel(3, "Second", "Sub", "Second", "", Core.Domain.MediaItemState.Normal, false); - MediaCardViewModel last = MultiSelectBase.ResetSelectionWithCards(selected, new[] { first, second }); + MultiSelectBase.ResetSelectionWithCards(selected, new[] { first, second }); selected.ShouldBe(new[] { first, second }, ignoreOrder: true); - last.ShouldBe(second); } [Test] @@ -30,9 +29,8 @@ public class MediaCardSelectionHelperTests var existingCard = new MediaCardViewModel(1, "Existing", "Sub", "Existing", "", Core.Domain.MediaItemState.Normal, false); var selected = new HashSet { existingCard }; - MediaCardViewModel last = MultiSelectBase.ResetSelectionWithCards(selected, []); + MultiSelectBase.ResetSelectionWithCards(selected, []); selected.ShouldBeEmpty(); - last.ShouldBeNull(); } } diff --git a/ErsatzTV/Pages/MultiSelectBase.cs b/ErsatzTV/Pages/MultiSelectBase.cs index 89ae6fdb4..c0418622c 100644 --- a/ErsatzTV/Pages/MultiSelectBase.cs +++ b/ErsatzTV/Pages/MultiSelectBase.cs @@ -248,15 +248,11 @@ public class MultiSelectBase : FragmentNavigationBase } } - internal static MediaCardViewModel ResetSelectionWithCards( + internal static void ResetSelectionWithCards( ISet selectedItems, IEnumerable cards) { - List cardList = (cards ?? Enumerable.Empty()).ToList(); - selectedItems.Clear(); - selectedItems.UnionWith(cardList); - - return cardList.LastOrDefault(); + selectedItems.UnionWith(cards); } }